diff --git a/PROMS/Formats/fmtall/PROMSDemo1all.xml b/PROMS/Formats/fmtall/PROMSDemo1all.xml new file mode 100644 index 00000000..c2b19d92 Binary files /dev/null and b/PROMS/Formats/fmtall/PROMSDemo1all.xml differ diff --git a/PROMS/Formats/fmtall/PROMSDemo2all.xml b/PROMS/Formats/fmtall/PROMSDemo2all.xml new file mode 100644 index 00000000..952f24c9 Binary files /dev/null and b/PROMS/Formats/fmtall/PROMSDemo2all.xml differ diff --git a/PROMS/Formats/fmtall/PROMSDemoALRall.xml b/PROMS/Formats/fmtall/PROMSDemoALRall.xml new file mode 100644 index 00000000..3e2a1a24 Binary files /dev/null and b/PROMS/Formats/fmtall/PROMSDemoALRall.xml differ diff --git a/PROMS/Formats/fmtall/PROMSDemoBCKall.xml b/PROMS/Formats/fmtall/PROMSDemoBCKall.xml new file mode 100644 index 00000000..f9e76fb9 Binary files /dev/null and b/PROMS/Formats/fmtall/PROMSDemoBCKall.xml differ diff --git a/PROMS/Formats/frmFormatCopy.Designer.cs b/PROMS/Formats/frmFormatCopy.Designer.cs index 01d3baf3..540f1e47 100644 --- a/PROMS/Formats/frmFormatCopy.Designer.cs +++ b/PROMS/Formats/frmFormatCopy.Designer.cs @@ -35,6 +35,7 @@ namespace Formats this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv(); + this.cbIncludeDemoFormats = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.SuspendLayout(); // // txbxPROMSFormatsPath @@ -131,11 +132,26 @@ namespace Formats this.LstBxExcludeFiles.TabIndex = 6; this.LstBxExcludeFiles.Text = "listBoxAdv1"; // + // cbIncludeDemoFormats + // + // + // + // + this.cbIncludeDemoFormats.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbIncludeDemoFormats.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbIncludeDemoFormats.Location = new System.Drawing.Point(43, 156); + this.cbIncludeDemoFormats.Name = "cbIncludeDemoFormats"; + this.cbIncludeDemoFormats.Size = new System.Drawing.Size(160, 23); + this.cbIncludeDemoFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2010; + this.cbIncludeDemoFormats.TabIndex = 7; + this.cbIncludeDemoFormats.Text = "Include Demo Formats"; + // // frmFormatCopy // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(496, 191); + this.Controls.Add(this.cbIncludeDemoFormats); this.Controls.Add(this.LstBxExcludeFiles); this.Controls.Add(this.labelX2); this.Controls.Add(this.buttonX2); @@ -158,6 +174,7 @@ namespace Formats private DevComponents.DotNetBar.ButtonX buttonX2; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles; + private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeDemoFormats; } } diff --git a/PROMS/Formats/frmFormatCopy.cs b/PROMS/Formats/frmFormatCopy.cs index b29c8e71..be941c3e 100644 --- a/PROMS/Formats/frmFormatCopy.cs +++ b/PROMS/Formats/frmFormatCopy.cs @@ -96,13 +96,17 @@ namespace Formats if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\"; } - public string[] excludeThese = { "WPS", "WPB", "VCBEPP" }; - + // Added a PROMSDemo to the list of excluded format files + public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" }; + + // Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the + // dialog is check private bool ExcludeFromCopy(string fn) { // don't copy formats whos file name starts with.. foreach (string excludeThis in excludeThese) - if (fn.ToUpper().StartsWith(excludeThis)) return true; + if (fn.ToUpper().StartsWith(excludeThis) + && !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true; return false; } @@ -161,5 +165,5 @@ namespace Formats Application.Exit(); } -} + } } \ No newline at end of file diff --git a/PROMS/Formats/genmacall/PROMSDemo1.svg b/PROMS/Formats/genmacall/PROMSDemo1.svg new file mode 100644 index 00000000..50f21e01 Binary files /dev/null and b/PROMS/Formats/genmacall/PROMSDemo1.svg differ diff --git a/PROMS/Formats/genmacall/PROMSDemo2.svg b/PROMS/Formats/genmacall/PROMSDemo2.svg new file mode 100644 index 00000000..fd8df888 Binary files /dev/null and b/PROMS/Formats/genmacall/PROMSDemo2.svg differ diff --git a/PROMS/Formats/genmacall/PROMSDemoALR.svg b/PROMS/Formats/genmacall/PROMSDemoALR.svg new file mode 100644 index 00000000..c5ae1d77 Binary files /dev/null and b/PROMS/Formats/genmacall/PROMSDemoALR.svg differ diff --git a/PROMS/Formats/genmacall/PROMSDemoBCK.svg b/PROMS/Formats/genmacall/PROMSDemoBCK.svg new file mode 100644 index 00000000..4b0b8281 Binary files /dev/null and b/PROMS/Formats/genmacall/PROMSDemoBCK.svg differ