diff --git a/PROMS/Formats/fmtall/FNPNew2all.xml b/PROMS/Formats/fmtall/FNPNew2all.xml index 3f9a3bb4..8aed627d 100644 Binary files a/PROMS/Formats/fmtall/FNPNew2all.xml and b/PROMS/Formats/fmtall/FNPNew2all.xml differ diff --git a/PROMS/Formats/fmtall/vcb1all.xml b/PROMS/Formats/fmtall/vcb1all.xml index 89b3f9c2..30d0e84b 100644 Binary files a/PROMS/Formats/fmtall/vcb1all.xml and b/PROMS/Formats/fmtall/vcb1all.xml differ diff --git a/PROMS/Formats/fmtall/vcb2all.xml b/PROMS/Formats/fmtall/vcb2all.xml index 4ccb3b9c..cd54bac2 100644 Binary files a/PROMS/Formats/fmtall/vcb2all.xml and b/PROMS/Formats/fmtall/vcb2all.xml differ diff --git a/PROMS/Formats/fmtall/vcbaall.xml b/PROMS/Formats/fmtall/vcbaall.xml index 5c39c444..b6cc7325 100644 Binary files a/PROMS/Formats/fmtall/vcbaall.xml and b/PROMS/Formats/fmtall/vcbaall.xml differ diff --git a/PROMS/Formats/fmtall/vcbalrall.xml b/PROMS/Formats/fmtall/vcbalrall.xml index a1cf541e..fec5f6fd 100644 Binary files a/PROMS/Formats/fmtall/vcbalrall.xml and b/PROMS/Formats/fmtall/vcbalrall.xml differ diff --git a/PROMS/Formats/fmtall/vcbbckall.xml b/PROMS/Formats/fmtall/vcbbckall.xml index 243bb2e0..3e7fdb25 100644 Binary files a/PROMS/Formats/fmtall/vcbbckall.xml and b/PROMS/Formats/fmtall/vcbbckall.xml differ diff --git a/PROMS/Formats/fmtall/vcbeppall.xml b/PROMS/Formats/fmtall/vcbeppall.xml index 5afe836a..880aee4b 100644 Binary files a/PROMS/Formats/fmtall/vcbeppall.xml and b/PROMS/Formats/fmtall/vcbeppall.xml differ diff --git a/PROMS/Formats/frmFormatCopy.Designer.cs b/PROMS/Formats/frmFormatCopy.Designer.cs index 7871f6a8..01d3baf3 100644 --- a/PROMS/Formats/frmFormatCopy.Designer.cs +++ b/PROMS/Formats/frmFormatCopy.Designer.cs @@ -33,6 +33,8 @@ namespace Formats this.btnCopyFormats = new DevComponents.DotNetBar.ButtonX(); this.btnBrowse = new DevComponents.DotNetBar.ButtonX(); this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv(); this.SuspendLayout(); // // txbxPROMSFormatsPath @@ -64,7 +66,7 @@ namespace Formats // this.btnCopyFormats.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCopyFormats.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCopyFormats.Location = new System.Drawing.Point(152, 68); + this.btnCopyFormats.Location = new System.Drawing.Point(232, 156); this.btnCopyFormats.Name = "btnCopyFormats"; this.btnCopyFormats.Size = new System.Drawing.Size(84, 27); this.btnCopyFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -88,7 +90,7 @@ namespace Formats // this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonX2.Location = new System.Drawing.Point(329, 68); + this.buttonX2.Location = new System.Drawing.Point(409, 156); this.buttonX2.Name = "buttonX2"; this.buttonX2.Size = new System.Drawing.Size(75, 23); this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -96,17 +98,52 @@ namespace Formats this.buttonX2.Text = "Exit"; this.buttonX2.Click += new System.EventHandler(this.buttonX2_Click); // - // Form1 + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(12, 41); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(200, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "Excluding Format Files that Start with:"; + // + // LstBxExcludeFiles + // + this.LstBxExcludeFiles.AutoScroll = true; + // + // + // + this.LstBxExcludeFiles.BackgroundStyle.Class = "ListBoxAdv"; + this.LstBxExcludeFiles.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.LstBxExcludeFiles.CausesValidation = false; + this.LstBxExcludeFiles.CheckStateMember = null; + this.LstBxExcludeFiles.ContainerControlProcessDialogKey = true; + this.LstBxExcludeFiles.DragDropSupport = true; + this.LstBxExcludeFiles.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.LstBxExcludeFiles.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; + this.LstBxExcludeFiles.Location = new System.Drawing.Point(57, 70); + this.LstBxExcludeFiles.Name = "LstBxExcludeFiles"; + this.LstBxExcludeFiles.ShowToolTips = false; + this.LstBxExcludeFiles.Size = new System.Drawing.Size(134, 76); + this.LstBxExcludeFiles.TabIndex = 6; + this.LstBxExcludeFiles.Text = "listBoxAdv1"; + // + // frmFormatCopy // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(496, 107); + this.ClientSize = new System.Drawing.Size(496, 191); + this.Controls.Add(this.LstBxExcludeFiles); + this.Controls.Add(this.labelX2); this.Controls.Add(this.buttonX2); this.Controls.Add(this.btnBrowse); this.Controls.Add(this.btnCopyFormats); this.Controls.Add(this.labelX1); this.Controls.Add(this.txbxPROMSFormatsPath); - this.Name = "Form1"; + this.Name = "frmFormatCopy"; this.Text = "Form1"; this.ResumeLayout(false); @@ -119,6 +156,8 @@ namespace Formats private DevComponents.DotNetBar.ButtonX btnCopyFormats; private DevComponents.DotNetBar.ButtonX btnBrowse; private DevComponents.DotNetBar.ButtonX buttonX2; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles; } } diff --git a/PROMS/Formats/frmFormatCopy.cs b/PROMS/Formats/frmFormatCopy.cs index d90b34e8..b29c8e71 100644 --- a/PROMS/Formats/frmFormatCopy.cs +++ b/PROMS/Formats/frmFormatCopy.cs @@ -14,7 +14,11 @@ namespace Formats public frmFormatCopy() { InitializeComponent(); - SetDefaults(); + foreach (string excludeThis in excludeThese) + { + LstBxExcludeFiles.Items.Add(excludeThis); + } + SetDefaults(); } private void SetDefaults() @@ -92,10 +96,11 @@ namespace Formats if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\"; } + public string[] excludeThese = { "WPS", "WPB", "VCBEPP" }; + private bool ExcludeFromCopy(string fn) { // don't copy formats whos file name starts with.. - string[] excludeThese = { "WPS", "WEP", "WPB", "VCBEPP" }; foreach (string excludeThis in excludeThese) if (fn.ToUpper().StartsWith(excludeThis)) return true; return false; diff --git a/PROMS/Formats/frmFormatCopy.resx b/PROMS/Formats/frmFormatCopy.resx index 19dc0dd8..d58980a3 100644 --- a/PROMS/Formats/frmFormatCopy.resx +++ b/PROMS/Formats/frmFormatCopy.resx @@ -112,9 +112,9 @@ 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 \ No newline at end of file