Compare commits

...

15 Commits

Author SHA1 Message Date
da4cbfd112 F2024-021 -Adjusted the page margins in the Vogtle 2 column format 2024-03-27 09:50:33 -04:00
e392c1fcc7 Merge pull request 'F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears.' (#279) from F2024-030_Vogtle3_4_PCTrans into Development
Reviewed-on: #279
2024-03-25 10:51:09 -04:00
eeacf9b969 F2024-030 - Fixed PC/PC procedure number in transitions so that only one appears. 2024-03-25 09:15:07 -04:00
cf13e2f7d5 Merge pull request 'F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step.' (#278) from F2024-046-RobinsonTransition into Development
Format only change.
2024-03-22 15:23:11 -04:00
5db530f4e8 F2024-046 - In Robinson format CPL, fixed transition {Section Number} {Page Num} so that it does not prompt saying you need to select a step. 2024-03-22 15:22:28 -04:00
d42e8115ec Merge pull request 'B2023-110-Symbols-in-tables' (#277) from B2023-110 into Development
changes are good for testing.
2024-03-22 15:19:38 -04:00
4f68414a8a B2023-110-Symbols-in-tables 2024-03-22 12:56:36 -04:00
9fd9eac16a Merge pull request 'B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel' (#276) from GeneralDebugging into Development
Reviewed-on: #276
2024-03-22 10:10:21 -04:00
c4e3ba10c6 B2024-016 - For Robinson, all local transitions will now have the option of including a page number. Generic, transitions defined to never include a step number will not display a list of steps in the Transitions Step Properties panel 2024-03-22 09:19:59 -04:00
3c632d4abc Merge pull request 'Fixing CSLA references' (#274) from GeneralDebugging into Development
fixing build errors
2024-03-20 14:12:13 -04:00
ccb2bab805 Fixing CSLA references 2024-03-20 14:11:56 -04:00
a5a0d389e2 Merge pull request 'F2024-037 Adjustments made for single column sections of the Vogtle Units 3 & 4, including length of un-numbered HLS, resetting the sub-step numbering when staring under an un-numbered HLS, removed “Two Column” from the section type name Purpose an…' (#273) from Vogtle3&4 into Development
Reviewed-on: #273
2024-03-19 16:23:41 -04:00
51ef1d127d Merge pull request 'CSLA_version_upgrade' (#272) from CSLA_version_upgrade into Development
Merging into Development.

**NOTE**
Developers will need to update their 3rd Party Library repository to ensure that they have the latest CSLA version.  Review the Git documentation in Confluence for instructions on cloning the repository.
2024-03-19 12:01:54 -04:00
31301c4717 ~Added CSLA v3.8.4 library 2024-03-19 11:21:21 -04:00
b01a9edc1e ~Upgraded CSLA library to v3.0.5 2024-03-18 11:42:04 -04:00
27 changed files with 491 additions and 361 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -44,8 +44,9 @@ using System.Runtime.InteropServices;
// Revision DHH (day - no leading zero, two digit hour - military time // Revision DHH (day - no leading zero, two digit hour - military time
// //
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
[assembly: AssemblyVersion("2.1.2403.413")] [assembly: AssemblyVersion("2.1.2403.2209")]
[assembly: AssemblyFileVersion("2.1.2403.413")] [assembly: AssemblyFileVersion("2.1.2403.2209")]

View File

@ -30,8 +30,8 @@ namespace VEPROMS
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.ppBtnCancel = new System.Windows.Forms.Button(); this.ppBtnCancel = new System.Windows.Forms.Button();
this.ppBtnOK = new System.Windows.Forms.Button(); this.ppBtnOK = new System.Windows.Forms.Button();
this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX(); this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX();
@ -95,17 +95,14 @@ namespace VEPROMS
this.ppLblDefSettingsInfo = new System.Windows.Forms.Label(); this.ppLblDefSettingsInfo = new System.Windows.Forms.Label();
this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog(); this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog();
this.tcVersions = new DevComponents.DotNetBar.TabControl(); this.tcVersions = new DevComponents.DotNetBar.TabControl();
this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
this.ppBtnRoToSql = new System.Windows.Forms.Button();
this.tbRoDb = new System.Windows.Forms.TextBox();
this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
this.cmbRoDb = new System.Windows.Forms.ComboBox();
this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.lblMOSLandcorner = new System.Windows.Forms.Label();
this.lblMOSLandyloc = new System.Windows.Forms.Label();
this.lblMOSLandxloc = new System.Windows.Forms.Label();
this.ppChbxMOSview = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.ppChbxMOSview = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.gpxMOSLocation = new DevComponents.DotNetBar.Controls.GroupPanel(); this.gpxMOSLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOScornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.ppCmbxMOScornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
@ -124,6 +121,16 @@ namespace VEPROMS
this.ppCmbxMOSformat = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.ppCmbxMOSformat = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.lblMOSformat = new System.Windows.Forms.Label(); this.lblMOSformat = new System.Windows.Forms.Label();
this.tiMergedOutputSettings = new DevComponents.DotNetBar.TabItem(this.components); this.tiMergedOutputSettings = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
this.ppBtnRoToSql = new System.Windows.Forms.Button();
this.tbRoDb = new System.Windows.Forms.TextBox();
this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
this.cmbRoDb = new System.Windows.Forms.ComboBox();
this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
this.ppChbxEnhancedAllowMods = new System.Windows.Forms.CheckBox(); this.ppChbxEnhancedAllowMods = new System.Windows.Forms.CheckBox();
this.btnUnlinkDocVersion = new System.Windows.Forms.Button(); this.btnUnlinkDocVersion = new System.Windows.Forms.Button();
@ -210,25 +217,19 @@ namespace VEPROMS
this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components); this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components); this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
this.lblMOSLandcorner = new System.Windows.Forms.Label();
this.lblMOSLandyloc = new System.Windows.Forms.Label();
this.lblMOSLandxloc = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit();
this.ppGpbxUserSpecCB.SuspendLayout(); this.ppGpbxUserSpecCB.SuspendLayout();
this.ppGpbxUserSpecTxt.SuspendLayout(); this.ppGpbxUserSpecTxt.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit();
this.tcVersions.SuspendLayout(); this.tcVersions.SuspendLayout();
this.tabControlPanel2.SuspendLayout();
this.gpxMOSLandLocation.SuspendLayout();
this.gpxMOSLocation.SuspendLayout();
this.gpxMOSfont.SuspendLayout();
this.tcpGeneral.SuspendLayout(); this.tcpGeneral.SuspendLayout();
this.tcpRefereceObjects.SuspendLayout(); this.tcpRefereceObjects.SuspendLayout();
this.ppGpbxUpROvals.SuspendLayout(); this.ppGpbxUpROvals.SuspendLayout();
this.tabControlPanel2.SuspendLayout();
this.gpxMOSLocation.SuspendLayout();
this.gpxMOSfont.SuspendLayout();
this.tabControlPanel1.SuspendLayout(); this.tabControlPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit();
@ -247,7 +248,6 @@ namespace VEPROMS
this.panVerBtns.SuspendLayout(); this.panVerBtns.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit();
this.gpxMOSLandLocation.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// ppBtnCancel // ppBtnCancel
@ -1102,9 +1102,9 @@ namespace VEPROMS
this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.tcVersions.BackColor = System.Drawing.Color.Transparent; this.tcVersions.BackColor = System.Drawing.Color.Transparent;
this.tcVersions.CanReorderTabs = true; this.tcVersions.CanReorderTabs = true;
this.tcVersions.Controls.Add(this.tabControlPanel2);
this.tcVersions.Controls.Add(this.tcpGeneral);
this.tcVersions.Controls.Add(this.tcpRefereceObjects); this.tcVersions.Controls.Add(this.tcpRefereceObjects);
this.tcVersions.Controls.Add(this.tcpGeneral);
this.tcVersions.Controls.Add(this.tabControlPanel2);
this.tcVersions.Controls.Add(this.tabControlPanel1); this.tcVersions.Controls.Add(this.tabControlPanel1);
this.tcVersions.Controls.Add(this.tcpApplicability); this.tcVersions.Controls.Add(this.tcpApplicability);
this.tcVersions.Controls.Add(this.tabControlPanel5); this.tcVersions.Controls.Add(this.tabControlPanel5);
@ -1130,173 +1130,6 @@ namespace VEPROMS
this.tcVersions.TabsVisible = false; this.tcVersions.TabsVisible = false;
this.tcVersions.Text = "tabControl1"; this.tcVersions.Text = "tabControl1";
// //
// tcpGeneral
//
this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
this.tcpGeneral.Controls.Add(this.ppRTxtName);
this.tcpGeneral.Controls.Add(this.label9);
this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
this.tcpGeneral.Controls.Add(this.lblProcSetRev);
this.tcpGeneral.Controls.Add(this.label4);
this.tcpGeneral.Controls.Add(this.label3);
this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
this.tcpGeneral.Controls.Add(this.ppDTPicker);
this.tcpGeneral.Controls.Add(this.label2);
this.tcpGeneral.Controls.Add(this.label1);
this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
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.Name = "tcpGeneral";
this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
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;
this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpGeneral.Style.GradientAngle = 90;
this.tcpGeneral.TabIndex = 1;
this.tcpGeneral.TabItem = this.tiGeneral;
//
// tiGeneral
//
this.tiGeneral.AttachedControl = this.tcpGeneral;
this.tiGeneral.Name = "tiGeneral";
this.tiGeneral.Text = "General";
//
// tcpRefereceObjects
//
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
this.tcpRefereceObjects.Controls.Add(this.label6);
this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Name = "tcpRefereceObjects";
this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpRefereceObjects.Style.GradientAngle = 90;
this.tcpRefereceObjects.TabIndex = 2;
this.tcpRefereceObjects.TabItem = this.tiRefObjs;
this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
//
// ppBtnRoToSql
//
this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
this.ppBtnRoToSql.Name = "ppBtnRoToSql";
this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
this.ppBtnRoToSql.TabIndex = 48;
this.ppBtnRoToSql.Text = "Migrate Data to Sql";
this.ppBtnRoToSql.UseVisualStyleBackColor = true;
this.ppBtnRoToSql.Visible = false;
this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
//
// tbRoDb
//
this.tbRoDb.Enabled = false;
this.tbRoDb.Location = new System.Drawing.Point(80, 13);
this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.tbRoDb.Name = "tbRoDb";
this.tbRoDb.Size = new System.Drawing.Size(318, 20);
this.tbRoDb.TabIndex = 20;
//
// ppBtnRoDbBrowse
//
this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
this.ppBtnRoDbBrowse.TabIndex = 22;
this.ppBtnRoDbBrowse.Text = "Browse...";
this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
//
// btnRoDbProperties
//
this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
this.btnRoDbProperties.Name = "btnRoDbProperties";
this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
this.btnRoDbProperties.TabIndex = 21;
this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
//
// cmbRoDb
//
this.cmbRoDb.FormattingEnabled = true;
this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.cmbRoDb.Name = "cmbRoDb";
this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
this.cmbRoDb.TabIndex = 47;
this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
//
// ppGpbxUpROvals
//
this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
//
//
//
this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
this.ppGpbxUpROvals.Style.CornerDiameter = 4;
this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ppGpbxUpROvals.TabIndex = 46;
this.ppGpbxUpROvals.Text = "RO Values";
//
// tiRefObjs
//
this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
this.tiRefObjs.Name = "tiRefObjs";
this.tiRefObjs.Text = "Referenced Objects";
//
// tabControlPanel2 // tabControlPanel2
// //
this.tabControlPanel2.Controls.Add(this.gpxMOSLandLocation); this.tabControlPanel2.Controls.Add(this.gpxMOSLandLocation);
@ -1324,6 +1157,128 @@ namespace VEPROMS
this.tabControlPanel2.TabIndex = 30; this.tabControlPanel2.TabIndex = 30;
this.tabControlPanel2.TabItem = this.tiMergedOutputSettings; this.tabControlPanel2.TabItem = this.tiMergedOutputSettings;
// //
// gpxMOSLandLocation
//
this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
//
//
//
this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
this.gpxMOSLandLocation.Style.CornerDiameter = 4;
this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.gpxMOSLandLocation.TabIndex = 7;
this.gpxMOSLandLocation.Text = "Landscape Location";
//
// ppCmbxMOSLandcornerLoc
//
this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
//
// tbxMOSLandyloc
//
//
//
//
this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
this.tbxMOSLandyloc.PreventEnterBeep = true;
this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandyloc.TabIndex = 8;
//
// tbxMOSLandxloc
//
//
//
//
this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
this.tbxMOSLandxloc.PreventEnterBeep = true;
this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandxloc.TabIndex = 7;
//
// lblMOSLandcorner
//
this.lblMOSLandcorner.AutoSize = true;
this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandcorner.Name = "lblMOSLandcorner";
this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
this.lblMOSLandcorner.TabIndex = 6;
this.lblMOSLandcorner.Text = "Corner:";
//
// lblMOSLandyloc
//
this.lblMOSLandyloc.AutoSize = true;
this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandyloc.Name = "lblMOSLandyloc";
this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandyloc.TabIndex = 5;
this.lblMOSLandyloc.Text = "Y (in):";
//
// lblMOSLandxloc
//
this.lblMOSLandxloc.AutoSize = true;
this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandxloc.Name = "lblMOSLandxloc";
this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandxloc.TabIndex = 4;
this.lblMOSLandxloc.Text = "X (in):";
//
// ppChbxMOSview // ppChbxMOSview
// //
this.ppChbxMOSview.BackColor = System.Drawing.Color.Transparent; this.ppChbxMOSview.BackColor = System.Drawing.Color.Transparent;
@ -1613,6 +1568,174 @@ namespace VEPROMS
this.tiMergedOutputSettings.Name = "tiMergedOutputSettings"; this.tiMergedOutputSettings.Name = "tiMergedOutputSettings";
this.tiMergedOutputSettings.Text = "Merged Output Settings"; this.tiMergedOutputSettings.Text = "Merged Output Settings";
// //
// tcpGeneral
//
this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
this.tcpGeneral.Controls.Add(this.ppRTxtName);
this.tcpGeneral.Controls.Add(this.label9);
this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
this.tcpGeneral.Controls.Add(this.lblProcSetRev);
this.tcpGeneral.Controls.Add(this.label4);
this.tcpGeneral.Controls.Add(this.label3);
this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
this.tcpGeneral.Controls.Add(this.ppDTPicker);
this.tcpGeneral.Controls.Add(this.label2);
this.tcpGeneral.Controls.Add(this.label1);
this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
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.Name = "tcpGeneral";
this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
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;
this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpGeneral.Style.GradientAngle = 90;
this.tcpGeneral.TabIndex = 1;
this.tcpGeneral.TabItem = this.tiGeneral;
//
// tiGeneral
//
this.tiGeneral.AttachedControl = this.tcpGeneral;
this.tiGeneral.Name = "tiGeneral";
this.tiGeneral.Text = "General";
//
// tcpRefereceObjects
//
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
this.tcpRefereceObjects.Controls.Add(this.label6);
this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Name = "tcpRefereceObjects";
this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
| DevComponents.DotNetBar.eBorderSide.Bottom)));
this.tcpRefereceObjects.Style.GradientAngle = 90;
this.tcpRefereceObjects.TabIndex = 2;
this.tcpRefereceObjects.TabItem = this.tiRefObjs;
this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
//
// ppBtnRoToSql
//
this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
this.ppBtnRoToSql.Name = "ppBtnRoToSql";
this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
this.ppBtnRoToSql.TabIndex = 48;
this.ppBtnRoToSql.Text = "Migrate Data to Sql";
this.ppBtnRoToSql.UseVisualStyleBackColor = true;
this.ppBtnRoToSql.Visible = false;
this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
//
// tbRoDb
//
this.tbRoDb.Enabled = false;
this.tbRoDb.Location = new System.Drawing.Point(80, 13);
this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.tbRoDb.Name = "tbRoDb";
this.tbRoDb.Size = new System.Drawing.Size(318, 20);
this.tbRoDb.TabIndex = 20;
this.tbRoDb.TextChanged += new System.EventHandler(this.tbRoDb_TextChanged);
//
// ppBtnRoDbBrowse
//
this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
this.ppBtnRoDbBrowse.TabIndex = 22;
this.ppBtnRoDbBrowse.Text = "Browse...";
this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
//
// btnRoDbProperties
//
this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
this.btnRoDbProperties.Name = "btnRoDbProperties";
this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
this.btnRoDbProperties.TabIndex = 21;
this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
//
// cmbRoDb
//
this.cmbRoDb.FormattingEnabled = true;
this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
this.cmbRoDb.Name = "cmbRoDb";
this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
this.cmbRoDb.TabIndex = 47;
this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
//
// ppGpbxUpROvals
//
this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
//
//
//
this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
this.ppGpbxUpROvals.Style.CornerDiameter = 4;
this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ppGpbxUpROvals.TabIndex = 46;
this.ppGpbxUpROvals.Text = "RO Values";
//
// tiRefObjs
//
this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
this.tiRefObjs.Name = "tiRefObjs";
this.tiRefObjs.Text = "Referenced Objects";
//
// tabControlPanel1 // tabControlPanel1
// //
this.tabControlPanel1.Controls.Add(this.ppChbxEnhancedAllowMods); this.tabControlPanel1.Controls.Add(this.ppChbxEnhancedAllowMods);
@ -2172,14 +2295,14 @@ namespace VEPROMS
this.documentEntryCountDataGridViewTextBoxColumn, this.documentEntryCountDataGridViewTextBoxColumn,
this.libTitleDataGridViewTextBoxColumn}); this.libTitleDataGridViewTextBoxColumn});
this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource; this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle2; this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle4;
this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill; this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill;
this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false; this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false;
@ -2196,8 +2319,8 @@ namespace VEPROMS
// documentEntryCountDataGridViewTextBoxColumn // documentEntryCountDataGridViewTextBoxColumn
// //
this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount"; this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages"; this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages";
this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn"; this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn";
this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true; this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true;
@ -2664,132 +2787,14 @@ namespace VEPROMS
this.btnGeneral.Text = "General"; this.btnGeneral.Text = "General";
this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click);
// //
// ROPrefixBindingSource
//
this.ROPrefixBindingSource.CurrentChanged += new System.EventHandler(this.ROPrefixBindingSource_CurrentChanged);
//
// formatInfoListBindingSource // formatInfoListBindingSource
// //
this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfo); this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfo);
// //
// gpxMOSLandLocation
//
this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
//
//
//
this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
this.gpxMOSLandLocation.Style.CornerDiameter = 4;
this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.gpxMOSLandLocation.TabIndex = 7;
this.gpxMOSLandLocation.Text = "Landscape Location";
//
// ppCmbxMOSLandcornerLoc
//
this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
//
// tbxMOSLandyloc
//
//
//
//
this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
this.tbxMOSLandyloc.PreventEnterBeep = true;
this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandyloc.TabIndex = 8;
//
// tbxMOSLandxloc
//
//
//
//
this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
this.tbxMOSLandxloc.PreventEnterBeep = true;
this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
this.tbxMOSLandxloc.TabIndex = 7;
//
// lblMOSLandcorner
//
this.lblMOSLandcorner.AutoSize = true;
this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandcorner.Name = "lblMOSLandcorner";
this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
this.lblMOSLandcorner.TabIndex = 6;
this.lblMOSLandcorner.Text = "Corner:";
//
// lblMOSLandyloc
//
this.lblMOSLandyloc.AutoSize = true;
this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandyloc.Name = "lblMOSLandyloc";
this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandyloc.TabIndex = 5;
this.lblMOSLandyloc.Text = "Y (in):";
//
// lblMOSLandxloc
//
this.lblMOSLandxloc.AutoSize = true;
this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblMOSLandxloc.Name = "lblMOSLandxloc";
this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
this.lblMOSLandxloc.TabIndex = 4;
this.lblMOSLandxloc.Text = "X (in):";
//
// frmVersionsProperties // frmVersionsProperties
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -2797,7 +2802,7 @@ namespace VEPROMS
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.CancelButton = this.ppBtnCancel; this.CancelButton = this.ppBtnCancel;
this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); 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(806, 365); this.ClientSize = new System.Drawing.Size(802, 361);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.panVerBtns); this.Controls.Add(this.panVerBtns);
this.Controls.Add(this.tcVersions); this.Controls.Add(this.tcVersions);
@ -2824,17 +2829,19 @@ namespace VEPROMS
this.ppGpbxUserSpecTxt.PerformLayout(); this.ppGpbxUserSpecTxt.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit();
this.tcVersions.ResumeLayout(false); this.tcVersions.ResumeLayout(false);
this.tabControlPanel2.ResumeLayout(false);
this.tabControlPanel2.PerformLayout();
this.gpxMOSLandLocation.ResumeLayout(false);
this.gpxMOSLandLocation.PerformLayout();
this.gpxMOSLocation.ResumeLayout(false);
this.gpxMOSLocation.PerformLayout();
this.gpxMOSfont.ResumeLayout(false);
this.gpxMOSfont.PerformLayout();
this.tcpGeneral.ResumeLayout(false); this.tcpGeneral.ResumeLayout(false);
this.tcpGeneral.PerformLayout(); this.tcpGeneral.PerformLayout();
this.tcpRefereceObjects.ResumeLayout(false); this.tcpRefereceObjects.ResumeLayout(false);
this.tcpRefereceObjects.PerformLayout(); this.tcpRefereceObjects.PerformLayout();
this.ppGpbxUpROvals.ResumeLayout(false); this.ppGpbxUpROvals.ResumeLayout(false);
this.tabControlPanel2.ResumeLayout(false);
this.tabControlPanel2.PerformLayout();
this.gpxMOSLocation.ResumeLayout(false);
this.gpxMOSLocation.PerformLayout();
this.gpxMOSfont.ResumeLayout(false);
this.gpxMOSfont.PerformLayout();
this.tabControlPanel1.ResumeLayout(false); this.tabControlPanel1.ResumeLayout(false);
this.tabControlPanel1.PerformLayout(); this.tabControlPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit();
@ -2859,8 +2866,6 @@ namespace VEPROMS
this.panVerBtns.ResumeLayout(false); this.panVerBtns.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit();
this.gpxMOSLandLocation.ResumeLayout(false);
this.gpxMOSLandLocation.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

View File

@ -1928,6 +1928,16 @@ namespace VEPROMS
#endregion #endregion
#endregion #endregion
private void tbRoDb_TextChanged(object sender, EventArgs e)
{
}
private void ROPrefixBindingSource_CurrentChanged(object sender, EventArgs e)
{
}
} }

View File

@ -123,6 +123,12 @@
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 17</value> <value>415, 17</value>
</metadata> </metadata>
<metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 17</value>
</metadata>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>643, 17</value>
</metadata>
<data name="ppCmbxFormat.SuperTooltip" xml:space="preserve"> <data name="ppCmbxFormat.SuperTooltip" xml:space="preserve">
<value>Allows you to specify the default format to use for all procedures in this set. <value>Allows you to specify the default format to use for all procedures in this set.
@ -210,9 +216,21 @@ Check "Show Default Settings" to display the "default" duplexing setting (below
<metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>817, 17</value> <value>817, 17</value>
</metadata> </metadata>
<metadata name="bsMiniEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 65</value>
</metadata>
<metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>817, 17</value>
</metadata>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value> <value>118, 17</value>
</metadata> </metadata>
<metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>

View File

@ -285,16 +285,24 @@ namespace VEPROMS.CSLA.Library
#region ROTextConvertMethods #region ROTextConvertMethods
// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing // B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
// step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode. // step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
public static string ROConvertSymbols(string retval) public static string ROConvertSymbols(string retval, ItemInfo MyItemInfo = null)
{ {
retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue
retval = retval.Replace("->", @"\u8594?"); // Right Arrow if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue)
retval = retval.Replace("<-", @"\u8592?"); // Left Arrow {
retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus retval = retval.Replace("->", @"\u8594?"); // Right Arrow
retval = retval.Replace("+-", @"\'b1"); // plus minus retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
}
if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
{
retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
retval = retval.Replace("+-", @"\'b1"); // plus minus
}
return retval; return retval;
} }
#endregion #endregion

View File

@ -695,9 +695,9 @@ namespace VEPROMS.CSLA.Library
newvalue = newvalue.Replace("`", @"\'b0"); newvalue = newvalue.Replace("`", @"\'b0");
// B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it // B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it
// is done here so that output (print & edit/view) has symbol, not 2 characters. // is done here so that output (print & edit/view) has symbol, not 2 characters.
if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue) _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
newvalue = ROFSTLookup.ROConvertSymbols(newvalue); newvalue = ROFSTLookup.ROConvertSymbols(newvalue, _MyItemInfo);
if (gg != newvalue) if (gg != newvalue)
text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength); text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength);

View File

@ -1184,7 +1184,9 @@ namespace VEPROMS.CSLA.Library
if (sectionInfo != null) if (sectionInfo != null)
{ {
// B2023-037: loading print text, resolve the RO symbols // B2023-037: loading print text, resolve the RO symbols
string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue|| sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue); bool GTLT = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
bool GLTArrows = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, itemInfo.IsTable && GTLT || GLTArrows);
ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
} }

View File

@ -978,7 +978,8 @@ namespace VEPROMS.CSLA.Library
retstr = unitnum.Replace("#", retstr); retstr = unitnum.Replace("#", retstr);
} }
// B2022-004: Remove Proc PC/PC token from transition text. // B2022-004: Remove Proc PC/PC token from transition text.
if (tb._FromItem.ActiveFormat != null && tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.ProcLevelPCPC && retstr.ToUpper().StartsWith("<U")) // F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing
if (tb._FromItem.ActiveFormat != null && !tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.KeepOnePCPCTag && tb._FromItem.ActiveFormat.PlantFormat.FormatData.TransData.ProcLevelPCPC && retstr.ToUpper().StartsWith("<U"))
{ {
int indx = retstr.IndexOf(">"); int indx = retstr.IndexOf(">");
retstr = retstr.Substring(indx + 1); retstr = retstr.Substring(indx + 1);

View File

@ -7279,6 +7279,15 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _ProcLevelPCPC, "@ProcLevelPCPC"); return LazyLoad(ref _ProcLevelPCPC, "@ProcLevelPCPC");
} }
} }
// F2024-030 for Vogtle Units 3 & 4, added KeepOnePCPCTag flag to keep one of the PC/PC tokens when editing
private LazyLoad<bool> _KeepOnePCPCTag;
public bool KeepOnePCPCTag
{
get
{
return LazyLoad(ref _KeepOnePCPCTag, "@KeepOnePCPCTag");
}
}
} }
#endregion #endregion
#region TransType #region TransType

View File

@ -83,8 +83,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL"> <Reference Include="Csla">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath> <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL"> <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">

View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="net462" />
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
<package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Reflection" version="4.3.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net462" />
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net462" />
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Runtime.Serialization.Xml" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Principal" version="4.3.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.Threading.ThreadPool" version="4.3.0" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages>

View File

@ -687,6 +687,8 @@ namespace Volian.Controls.Library
cbPageNum.Checked = _ModExistingPageNum = tc != null && tc.Transition_Formatted.ToUpper() == "TRUE"; cbPageNum.Checked = _ModExistingPageNum = tc != null && tc.Transition_Formatted.ToUpper() == "TRUE";
} }
} }
// B2024-016 if transition format does not have {First Step} then don't show step list
HideStepTreeIfNeeded();
} }
#endregion #endregion
#region Events #region Events
@ -916,11 +918,10 @@ namespace Volian.Controls.Library
} }
else else
{ {
_InitializingTrans = true; // just initializing now, don't set any ranges, etc. _InitializingTrans = true; // just initializing now, don't set any ranges, etc.
tvTranFillIn((secitm.Steps == null || secitm.Steps.Count == 0) ? null : secitm.Steps[0]); tvTranFillIn((secitm.Steps == null || secitm.Steps.Count == 0) ? null : secitm.Steps[0]);
tvTran.Enabled = true; // B2024-016 only show the list of steps if used by the select transition
cbIncStepNum.Enabled = true; HideStepTreeIfNeeded();
cbIncStepNum.Checked = true;
// if doing a 'new' range, no node is selected in tree. Without this, the first node in the // if doing a 'new' range, no node is selected in tree. Without this, the first node in the
// tree was the selected node which was throwing off the logic for defining the _RangeNode1 // tree was the selected node which was throwing off the logic for defining the _RangeNode1
// and _RangeNode2 // and _RangeNode2
@ -935,6 +936,18 @@ namespace Volian.Controls.Library
SaveCancelEnabling(); SaveCancelEnabling();
} }
} }
// B2024-016 Hide the step tree when the transition definition does not include a step number {First Step}
private void HideStepTreeIfNeeded()
{
string trnFmt = _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransFormat;
bool showStepList = trnFmt.Contains("{First Step}");
if (!showStepList)
tvTran.Nodes.Clear(); // clear the tree view of steps if not needed for selected transition
tvTran.Enabled = showStepList; // show the tree view of steps?
cbIncStepNum.Enabled = showStepList; // display the Include Step checkbox?
cbIncStepNum.Checked = showStepList; // uncheck the Include Step?
}
// B2018-002 - Invalid Transitions - Declare Default Section variables // B2018-002 - Invalid Transitions - Declare Default Section variables
private bool NeedsDefault; private bool NeedsDefault;
private bool HasDefault; private bool HasDefault;

View File

@ -93,8 +93,7 @@
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL"> <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL"> <Reference Include="Csla">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath> <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
</Reference> </Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL"> <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">

View File

@ -68,8 +68,7 @@
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL"> <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL"> <Reference Include="Csla">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath> <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
</Reference> </Reference>
<Reference Include="FlexableMessageBox"> <Reference Include="FlexableMessageBox">

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@ -1407,7 +1407,8 @@ namespace Volian.Print.Library
} }
} }
} }
StepConfig sc = new StepConfig(MyItemInfo as StepInfo); StepInfo si = (StepInfo)MyItemInfo;
StepConfig sc = new StepConfig(si.MyContent.Config);
if (sc != null && sc.Step_ImageWidth != 0) if (sc != null && sc.Step_ImageWidth != 0)
{ {
Width = sc.Step_ImageWidth; Width = sc.Step_ImageWidth;
@ -4184,7 +4185,8 @@ namespace Volian.Print.Library
{ {
Width *= (h2 / h1); Width *= (h2 / h1);
} }
StepConfig sc = new StepConfig(MyItemInfo as StepInfo); StepInfo si = (StepInfo)MyItemInfo;
StepConfig sc = new StepConfig(si.MyContent.Config);
if (sc != null && sc.Step_ImageWidth != 0) if (sc != null && sc.Step_ImageWidth != 0)
{ {
Width = sc.Step_ImageWidth; Width = sc.Step_ImageWidth;