diff --git a/Applications/Source/Palette Designer/FormChromeRibbon.Designer.cs b/Applications/Source/Palette Designer/FormChromeRibbon.Designer.cs index 72c8cf0..1c2338a 100644 --- a/Applications/Source/Palette Designer/FormChromeRibbon.Designer.cs +++ b/Applications/Source/Palette Designer/FormChromeRibbon.Designer.cs @@ -125,7 +125,7 @@ private void InitializeComponent() this.kryptonRibbonQATButton1, this.kryptonRibbonQATButton2, this.kryptonRibbonQATButton3}); - this.kryptonRibbon1.RibbonAppButton.AppButtonMenuItems.AddRange(new Krypton.Toolkit.KryptonContextMenuItemBase[] { + this.kryptonRibbon1.RibbonFileAppButton.AppButtonMenuItems.AddRange(new Krypton.Toolkit.KryptonContextMenuItemBase[] { this.kryptonContextMenuItem6, this.kryptonContextMenuSeparator1, this.kryptonContextMenuItem3, @@ -135,13 +135,13 @@ private void InitializeComponent() this.kryptonContextMenuItem5, this.kryptonContextMenuSeparator2, this.kryptonContextMenuItem7}); - this.kryptonRibbon1.RibbonAppButton.AppButtonMinRecentSize = new System.Drawing.Size(200, 200); - this.kryptonRibbon1.RibbonAppButton.AppButtonRecentDocs.AddRange(new Krypton.Ribbon.KryptonRibbonRecentDoc[] { + this.kryptonRibbon1.RibbonFileAppButton.AppButtonMinRecentSize = new System.Drawing.Size(200, 200); + this.kryptonRibbon1.RibbonFileAppButton.AppButtonRecentDocs.AddRange(new Krypton.Ribbon.KryptonRibbonRecentDoc[] { this.kryptonRibbonRecentDoc1, this.kryptonRibbonRecentDoc2, this.kryptonRibbonRecentDoc3, this.kryptonRibbonRecentDoc4}); - this.kryptonRibbon1.RibbonAppButton.AppButtonSpecs.AddRange(new Krypton.Ribbon.ButtonSpecAppMenu[] { + this.kryptonRibbon1.RibbonFileAppButton.AppButtonSpecs.AddRange(new Krypton.Ribbon.ButtonSpecAppMenu[] { this.buttonSpecAppMenu2, this.buttonSpecAppMenu1}); this.kryptonRibbon1.RibbonContexts.AddRange(new Krypton.Ribbon.KryptonRibbonContext[] { diff --git a/Applications/Source/Palette Designer/FormChromeRibbon.cs b/Applications/Source/Palette Designer/FormChromeRibbon.cs index 26ebbbe..690fb15 100644 --- a/Applications/Source/Palette Designer/FormChromeRibbon.cs +++ b/Applications/Source/Palette Designer/FormChromeRibbon.cs @@ -5,11 +5,13 @@ * © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved. * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. * */ #endregion +using System.ComponentModel; + namespace PaletteDesigner { public partial class FormChromeRibbon : KryptonForm @@ -22,13 +24,14 @@ public FormChromeRibbon() #endregion #region Public + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public KryptonCustomPaletteBase OverridePalette { set { - Palette = value; + LocalCustomPalette = value; kryptonPanel1.Palette = value; - kryptonRibbon1.Palette = value; + kryptonRibbon1.LocalCustomPalette = value; } } #endregion diff --git a/Applications/Source/Palette Designer/FormChromeTMS.cs b/Applications/Source/Palette Designer/FormChromeTMS.cs index 13c20ac..ee0695c 100644 --- a/Applications/Source/Palette Designer/FormChromeTMS.cs +++ b/Applications/Source/Palette Designer/FormChromeTMS.cs @@ -5,11 +5,13 @@ * © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved. * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. * */ #endregion +using System.ComponentModel; + namespace PaletteDesigner { public partial class FormChromeTMS : KryptonForm @@ -23,8 +25,10 @@ public FormChromeTMS() #region Public + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public KryptonProgressBarToolStripItem ToolStripKryptonProgressBar => kryptonProgressBarToolStripItem1; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public ToolStripRenderer OverrideToolStripRenderer { set diff --git a/Applications/Source/Palette Designer/FormPaletteUpgradeTool.Designer.cs b/Applications/Source/Palette Designer/FormPaletteUpgradeTool.Designer.cs index 8e457d1..d5dc7c3 100644 --- a/Applications/Source/Palette Designer/FormPaletteUpgradeTool.Designer.cs +++ b/Applications/Source/Palette Designer/FormPaletteUpgradeTool.Designer.cs @@ -30,31 +30,31 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormPaletteUpgradeTool)); this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel(); - this.kryptonPanel2 = new Krypton.Toolkit.KryptonPanel(); - this.kryptonPanel3 = new Krypton.Toolkit.KryptonPanel(); - this.kryptonBorderEdge1 = new Krypton.Toolkit.KryptonBorderEdge(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.kryptonLabel1 = new Krypton.Toolkit.KryptonLabel(); - this.kryptonLabel2 = new Krypton.Toolkit.KryptonLabel(); - this.kryptonLabel3 = new Krypton.Toolkit.KryptonLabel(); - this.kbtnCancel = new Krypton.Toolkit.KryptonButton(); - this.kbtnUpgrade = new Krypton.Toolkit.KryptonButton(); this.kryptonComboBox1 = new Krypton.Toolkit.KryptonComboBox(); - this.kcmdBrowseForOriginalFile = new Krypton.Toolkit.KryptonCommand(); + this.kbtnUpgrade = new Krypton.Toolkit.KryptonButton(); + this.kbtnCancel = new Krypton.Toolkit.KryptonButton(); + this.kryptonBorderEdge1 = new Krypton.Toolkit.KryptonBorderEdge(); + this.kryptonPanel2 = new Krypton.Toolkit.KryptonPanel(); + this.krtbInput = new Krypton.Toolkit.KryptonRichTextBox(); + this.bsaBrowseForOriginal = new Krypton.Toolkit.ButtonSpecAny(); this.kcmdBrowseForUpgradedFile = new Krypton.Toolkit.KryptonCommand(); - this.klblStatus = new Krypton.Toolkit.KryptonLabel(); this.krtbOutput = new Krypton.Toolkit.KryptonRichTextBox(); this.buttonSpecAny1 = new Krypton.Toolkit.ButtonSpecAny(); - this.krtbInput = new Krypton.Toolkit.KryptonRichTextBox(); - this.bsaBrowseForOriginal = new Krypton.Toolkit.ButtonSpecAny(); + this.klblStatus = new Krypton.Toolkit.KryptonLabel(); + this.kryptonLabel3 = new Krypton.Toolkit.KryptonLabel(); + this.kryptonLabel2 = new Krypton.Toolkit.KryptonLabel(); + this.kryptonPanel3 = new Krypton.Toolkit.KryptonPanel(); + this.kryptonLabel1 = new Krypton.Toolkit.KryptonLabel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.kcmdBrowseForOriginalFile = new Krypton.Toolkit.KryptonCommand(); ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit(); this.kryptonPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.kryptonComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel2)).BeginInit(); this.kryptonPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel3)).BeginInit(); this.kryptonPanel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonComboBox1)).BeginInit(); this.SuspendLayout(); // // kryptonPanel1 @@ -64,191 +64,202 @@ private void InitializeComponent() this.kryptonPanel1.Controls.Add(this.kbtnCancel); this.kryptonPanel1.Controls.Add(this.kryptonBorderEdge1); this.kryptonPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.kryptonPanel1.Location = new System.Drawing.Point(0, 402); + this.kryptonPanel1.Location = new System.Drawing.Point(0, 494); + this.kryptonPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonPanel1.Name = "kryptonPanel1"; this.kryptonPanel1.PanelBackStyle = Krypton.Toolkit.PaletteBackStyle.PanelAlternate; - this.kryptonPanel1.Size = new System.Drawing.Size(679, 50); + this.kryptonPanel1.Size = new System.Drawing.Size(905, 62); this.kryptonPanel1.TabIndex = 0; // - // kryptonPanel2 + // kryptonComboBox1 // - this.kryptonPanel2.Controls.Add(this.krtbInput); - this.kryptonPanel2.Controls.Add(this.krtbOutput); - this.kryptonPanel2.Controls.Add(this.klblStatus); - this.kryptonPanel2.Controls.Add(this.kryptonLabel3); - this.kryptonPanel2.Controls.Add(this.kryptonLabel2); - this.kryptonPanel2.Controls.Add(this.kryptonPanel3); - this.kryptonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonPanel2.Location = new System.Drawing.Point(0, 0); - this.kryptonPanel2.Name = "kryptonPanel2"; - this.kryptonPanel2.Size = new System.Drawing.Size(679, 402); - this.kryptonPanel2.TabIndex = 1; + this.kryptonComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.kryptonComboBox1.DropDownWidth = 121; + this.kryptonComboBox1.IntegralHeight = false; + this.kryptonComboBox1.Location = new System.Drawing.Point(17, 18); + this.kryptonComboBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kryptonComboBox1.Name = "kryptonComboBox1"; + this.kryptonComboBox1.Size = new System.Drawing.Size(161, 26); + this.kryptonComboBox1.StateCommon.ComboBox.Content.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near; + this.kryptonComboBox1.TabIndex = 3; + this.kryptonComboBox1.Visible = false; // - // kryptonPanel3 + // kbtnUpgrade // - this.kryptonPanel3.Controls.Add(this.kryptonLabel1); - this.kryptonPanel3.Controls.Add(this.pictureBox1); - this.kryptonPanel3.Dock = System.Windows.Forms.DockStyle.Top; - this.kryptonPanel3.Location = new System.Drawing.Point(0, 0); - this.kryptonPanel3.Name = "kryptonPanel3"; - this.kryptonPanel3.PanelBackStyle = Krypton.Toolkit.PaletteBackStyle.ControlCustom1; - this.kryptonPanel3.Size = new System.Drawing.Size(679, 100); - this.kryptonPanel3.TabIndex = 0; + this.kbtnUpgrade.Enabled = false; + this.kbtnUpgrade.Location = new System.Drawing.Point(639, 15); + this.kbtnUpgrade.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kbtnUpgrade.Name = "kbtnUpgrade"; + this.kbtnUpgrade.Size = new System.Drawing.Size(120, 31); + this.kbtnUpgrade.TabIndex = 2; + this.kbtnUpgrade.Values.DropDownArrowColor = System.Drawing.Color.Empty; + this.kbtnUpgrade.Values.Text = "&Upgrade"; + this.kbtnUpgrade.Click += new System.EventHandler(this.kbtnUpgrade_Click); + // + // kbtnCancel + // + this.kbtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.kbtnCancel.Location = new System.Drawing.Point(767, 16); + this.kbtnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kbtnCancel.Name = "kbtnCancel"; + this.kbtnCancel.Size = new System.Drawing.Size(120, 31); + this.kbtnCancel.TabIndex = 1; + this.kbtnCancel.Values.DropDownArrowColor = System.Drawing.Color.Empty; + this.kbtnCancel.Values.Text = "Cance&l"; + this.kbtnCancel.Click += new System.EventHandler(this.kbtnCancel_Click); // // kryptonBorderEdge1 // this.kryptonBorderEdge1.BorderStyle = Krypton.Toolkit.PaletteBorderStyle.HeaderPrimary; this.kryptonBorderEdge1.Dock = System.Windows.Forms.DockStyle.Top; this.kryptonBorderEdge1.Location = new System.Drawing.Point(0, 0); + this.kryptonBorderEdge1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonBorderEdge1.Name = "kryptonBorderEdge1"; - this.kryptonBorderEdge1.Size = new System.Drawing.Size(679, 1); + this.kryptonBorderEdge1.Size = new System.Drawing.Size(905, 1); this.kryptonBorderEdge1.Text = "kryptonBorderEdge1"; // - // pictureBox1 - // - this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Right; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(579, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(100, 100); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox1.TabIndex = 0; - this.pictureBox1.TabStop = false; - // - // kryptonLabel1 - // - this.kryptonLabel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonLabel1.LabelStyle = Krypton.Toolkit.LabelStyle.TitlePanel; - this.kryptonLabel1.Location = new System.Drawing.Point(0, 0); - this.kryptonLabel1.Name = "kryptonLabel1"; - this.kryptonLabel1.Size = new System.Drawing.Size(579, 100); - this.kryptonLabel1.TabIndex = 1; - this.kryptonLabel1.Values.Text = "Palette Upgrade Tool"; - // - // kryptonLabel2 - // - this.kryptonLabel2.LabelStyle = Krypton.Toolkit.LabelStyle.BoldControl; - this.kryptonLabel2.Location = new System.Drawing.Point(13, 107); - this.kryptonLabel2.Name = "kryptonLabel2"; - this.kryptonLabel2.Size = new System.Drawing.Size(125, 20); - this.kryptonLabel2.TabIndex = 1; - this.kryptonLabel2.Values.Text = "Original Palette File"; - // - // kryptonLabel3 + // kryptonPanel2 // - this.kryptonLabel3.LabelStyle = Krypton.Toolkit.LabelStyle.BoldControl; - this.kryptonLabel3.Location = new System.Drawing.Point(13, 235); - this.kryptonLabel3.Name = "kryptonLabel3"; - this.kryptonLabel3.Size = new System.Drawing.Size(136, 20); - this.kryptonLabel3.TabIndex = 3; - this.kryptonLabel3.Values.Text = "Upgraded Palette File"; + this.kryptonPanel2.Controls.Add(this.krtbInput); + this.kryptonPanel2.Controls.Add(this.krtbOutput); + this.kryptonPanel2.Controls.Add(this.klblStatus); + this.kryptonPanel2.Controls.Add(this.kryptonLabel3); + this.kryptonPanel2.Controls.Add(this.kryptonLabel2); + this.kryptonPanel2.Controls.Add(this.kryptonPanel3); + this.kryptonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.kryptonPanel2.Location = new System.Drawing.Point(0, 0); + this.kryptonPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kryptonPanel2.Name = "kryptonPanel2"; + this.kryptonPanel2.Size = new System.Drawing.Size(905, 494); + this.kryptonPanel2.TabIndex = 1; // - // kbtnCancel + // krtbInput // - this.kbtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.kbtnCancel.Location = new System.Drawing.Point(575, 13); - this.kbtnCancel.Name = "kbtnCancel"; - this.kbtnCancel.Size = new System.Drawing.Size(90, 25); - this.kbtnCancel.TabIndex = 1; - this.kbtnCancel.Values.Text = "Cance&l"; - this.kbtnCancel.Click += new System.EventHandler(this.kbtnCancel_Click); + this.krtbInput.ButtonSpecs.Add(this.bsaBrowseForOriginal); + this.krtbInput.Location = new System.Drawing.Point(17, 164); + this.krtbInput.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.krtbInput.Name = "krtbInput"; + this.krtbInput.Size = new System.Drawing.Size(869, 118); + this.krtbInput.TabIndex = 7; + this.krtbInput.Text = ""; // - // kbtnUpgrade + // bsaBrowseForOriginal // - this.kbtnUpgrade.Enabled = false; - this.kbtnUpgrade.Location = new System.Drawing.Point(479, 12); - this.kbtnUpgrade.Name = "kbtnUpgrade"; - this.kbtnUpgrade.Size = new System.Drawing.Size(90, 25); - this.kbtnUpgrade.TabIndex = 2; - this.kbtnUpgrade.Values.Text = "&Upgrade"; - this.kbtnUpgrade.Click += new System.EventHandler(this.kbtnUpgrade_Click); + this.bsaBrowseForOriginal.Enabled = Krypton.Toolkit.ButtonEnabled.True; + this.bsaBrowseForOriginal.KryptonCommand = this.kcmdBrowseForUpgradedFile; + this.bsaBrowseForOriginal.Text = "Browse"; + this.bsaBrowseForOriginal.UniqueName = "bb6174a6bb674e219e076702012a00aa"; + this.bsaBrowseForOriginal.Click += new System.EventHandler(this.bsaBrowseForOriginal_Click); // - // kryptonComboBox1 + // kcmdBrowseForUpgradedFile // - this.kryptonComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.kryptonComboBox1.DropDownWidth = 121; - this.kryptonComboBox1.IntegralHeight = false; - this.kryptonComboBox1.Location = new System.Drawing.Point(13, 15); - this.kryptonComboBox1.Name = "kryptonComboBox1"; - this.kryptonComboBox1.Size = new System.Drawing.Size(121, 21); - this.kryptonComboBox1.StateCommon.ComboBox.Content.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near; - this.kryptonComboBox1.TabIndex = 3; - this.kryptonComboBox1.Visible = false; + this.kcmdBrowseForUpgradedFile.AssignedButtonSpec = this.buttonSpecAny1; + this.kcmdBrowseForUpgradedFile.Text = "&..."; + this.kcmdBrowseForUpgradedFile.Execute += new System.EventHandler(this.kcmdBrowseForUpgradedFile_Execute); // - // kcmdBrowseForOriginalFile + // krtbOutput // - this.kcmdBrowseForOriginalFile.Text = "&..."; - this.kcmdBrowseForOriginalFile.Execute += new System.EventHandler(this.kcmdBrowseForOriginalFile_Execute); + this.krtbOutput.ButtonSpecs.Add(this.buttonSpecAny1); + this.krtbOutput.Location = new System.Drawing.Point(17, 321); + this.krtbOutput.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.krtbOutput.Name = "krtbOutput"; + this.krtbOutput.Size = new System.Drawing.Size(869, 118); + this.krtbOutput.TabIndex = 6; + this.krtbOutput.Text = ""; + this.krtbOutput.TextChanged += new System.EventHandler(this.krtbOutput_TextChanged); // - // kcmdBrowseForUpgradedFile + // buttonSpecAny1 // - this.kcmdBrowseForUpgradedFile.Text = "&..."; - this.kcmdBrowseForUpgradedFile.Execute += new System.EventHandler(this.kcmdBrowseForUpgradedFile_Execute); + this.buttonSpecAny1.Enabled = Krypton.Toolkit.ButtonEnabled.True; + this.buttonSpecAny1.KryptonCommand = this.kcmdBrowseForUpgradedFile; + this.buttonSpecAny1.UniqueName = "bb6174a6bb674e219e076702012a00aa"; // // klblStatus // this.klblStatus.LabelStyle = Krypton.Toolkit.LabelStyle.BoldControl; - this.klblStatus.Location = new System.Drawing.Point(13, 363); + this.klblStatus.Location = new System.Drawing.Point(17, 447); + this.klblStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.klblStatus.Name = "klblStatus"; - this.klblStatus.Size = new System.Drawing.Size(120, 23); + this.klblStatus.Size = new System.Drawing.Size(148, 28); this.klblStatus.StateCommon.ShortText.Color1 = System.Drawing.Color.Red; this.klblStatus.StateCommon.ShortText.Color2 = System.Drawing.Color.Red; this.klblStatus.StateCommon.ShortText.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.klblStatus.StateCommon.ShortText.ImageStyle = Krypton.Toolkit.PaletteImageStyle.Inherit; - this.klblStatus.StateCommon.ShortText.Trim = Krypton.Toolkit.PaletteTextTrim.Inherit; this.klblStatus.TabIndex = 5; this.klblStatus.Values.Text = "kryptonLabel4"; // - // krtbOutput + // kryptonLabel3 // - this.krtbOutput.ButtonSpecs.Add(this.buttonSpecAny1); - this.krtbOutput.Location = new System.Drawing.Point(13, 261); - this.krtbOutput.Name = "krtbOutput"; - this.krtbOutput.Size = new System.Drawing.Size(652, 96); - this.krtbOutput.TabIndex = 6; - this.krtbOutput.Text = ""; - this.krtbOutput.TextChanged += new System.EventHandler(this.krtbOutput_TextChanged); + this.kryptonLabel3.LabelStyle = Krypton.Toolkit.LabelStyle.BoldControl; + this.kryptonLabel3.Location = new System.Drawing.Point(17, 289); + this.kryptonLabel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kryptonLabel3.Name = "kryptonLabel3"; + this.kryptonLabel3.Size = new System.Drawing.Size(168, 24); + this.kryptonLabel3.TabIndex = 3; + this.kryptonLabel3.Values.Text = "Upgraded Palette File"; // - // buttonSpecAny1 + // kryptonLabel2 // - this.buttonSpecAny1.Enabled = Krypton.Toolkit.ButtonEnabled.True; - this.buttonSpecAny1.KryptonCommand = this.kcmdBrowseForUpgradedFile; - this.buttonSpecAny1.Style = Krypton.Toolkit.PaletteButtonStyle.Inherit; - this.buttonSpecAny1.ToolTipStyle = Krypton.Toolkit.LabelStyle.ToolTip; - this.buttonSpecAny1.Type = Krypton.Toolkit.PaletteButtonSpecStyle.Generic; - this.buttonSpecAny1.UniqueName = "bb6174a6bb674e219e076702012a00aa"; + this.kryptonLabel2.LabelStyle = Krypton.Toolkit.LabelStyle.BoldControl; + this.kryptonLabel2.Location = new System.Drawing.Point(17, 132); + this.kryptonLabel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kryptonLabel2.Name = "kryptonLabel2"; + this.kryptonLabel2.Size = new System.Drawing.Size(154, 24); + this.kryptonLabel2.TabIndex = 1; + this.kryptonLabel2.Values.Text = "Original Palette File"; // - // krtbInput + // kryptonPanel3 // - this.krtbInput.ButtonSpecs.Add(this.bsaBrowseForOriginal); - this.krtbInput.Location = new System.Drawing.Point(13, 133); - this.krtbInput.Name = "krtbInput"; - this.krtbInput.Size = new System.Drawing.Size(652, 96); - this.krtbInput.TabIndex = 7; - this.krtbInput.Text = ""; + this.kryptonPanel3.Controls.Add(this.kryptonLabel1); + this.kryptonPanel3.Controls.Add(this.pictureBox1); + this.kryptonPanel3.Dock = System.Windows.Forms.DockStyle.Top; + this.kryptonPanel3.Location = new System.Drawing.Point(0, 0); + this.kryptonPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kryptonPanel3.Name = "kryptonPanel3"; + this.kryptonPanel3.PanelBackStyle = Krypton.Toolkit.PaletteBackStyle.ControlCustom1; + this.kryptonPanel3.Size = new System.Drawing.Size(905, 123); + this.kryptonPanel3.TabIndex = 0; // - // bsaBrowseForOriginal + // kryptonLabel1 // - this.bsaBrowseForOriginal.Enabled = Krypton.Toolkit.ButtonEnabled.True; - this.bsaBrowseForOriginal.KryptonCommand = this.kcmdBrowseForUpgradedFile; - this.bsaBrowseForOriginal.Style = Krypton.Toolkit.PaletteButtonStyle.Inherit; - this.bsaBrowseForOriginal.ToolTipStyle = Krypton.Toolkit.LabelStyle.ToolTip; - this.bsaBrowseForOriginal.Type = Krypton.Toolkit.PaletteButtonSpecStyle.Generic; - this.bsaBrowseForOriginal.UniqueName = "bb6174a6bb674e219e076702012a00aa"; - this.bsaBrowseForOriginal.Click += new System.EventHandler(this.bsaBrowseForOriginal_Click); + this.kryptonLabel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.kryptonLabel1.LabelStyle = Krypton.Toolkit.LabelStyle.TitlePanel; + this.kryptonLabel1.Location = new System.Drawing.Point(0, 0); + this.kryptonLabel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.kryptonLabel1.Name = "kryptonLabel1"; + this.kryptonLabel1.Size = new System.Drawing.Size(772, 123); + this.kryptonLabel1.TabIndex = 1; + this.kryptonLabel1.Values.Text = "Palette Upgrade Tool"; + // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.Color.Transparent; + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Right; + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(772, 0); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(133, 123); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // kcmdBrowseForOriginalFile + // + this.kcmdBrowseForOriginalFile.Text = "&..."; + this.kcmdBrowseForOriginalFile.Execute += new System.EventHandler(this.kcmdBrowseForOriginalFile_Execute); // // FormPaletteUpgradeTool // this.AcceptButton = this.kbtnUpgrade; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.kbtnCancel; - this.ClientSize = new System.Drawing.Size(679, 452); + this.ClientSize = new System.Drawing.Size(905, 556); this.Controls.Add(this.kryptonPanel2); this.Controls.Add(this.kryptonPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormPaletteUpgradeTool"; @@ -259,6 +270,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).EndInit(); this.kryptonPanel1.ResumeLayout(false); this.kryptonPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.kryptonComboBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel2)).EndInit(); this.kryptonPanel2.ResumeLayout(false); this.kryptonPanel2.PerformLayout(); @@ -266,7 +278,6 @@ private void InitializeComponent() this.kryptonPanel3.ResumeLayout(false); this.kryptonPanel3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonComboBox1)).EndInit(); this.ResumeLayout(false); } diff --git a/Applications/Source/Palette Designer/FormPaletteUpgradeTool.cs b/Applications/Source/Palette Designer/FormPaletteUpgradeTool.cs index e69f2d3..7a37674 100644 --- a/Applications/Source/Palette Designer/FormPaletteUpgradeTool.cs +++ b/Applications/Source/Palette Designer/FormPaletteUpgradeTool.cs @@ -1,9 +1,7 @@ #region BSD License /* - * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2023 - 2023. All rights reserved. - * + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2023 - 2024. All rights reserved. */ #endregion @@ -20,13 +18,13 @@ public partial class FormPaletteUpgradeTool : KryptonForm private const int MINIMUM_PALETTE_FILE_VERSION = 2; - private const int MAXIMUM_PALETTE_FILE_VERSION = 20; + private const int MAXIMUM_PALETTE_FILE_VERSION = GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION; #endregion #region Public - public int InputVersionNumber { get; set; } + private int _inputVersionNumber; #endregion @@ -46,11 +44,11 @@ public FormPaletteUpgradeTool() #region Setters and Getters /// Sets the InputVersionNumber to the value of value. /// The desired value of InputVersionNumber. - private void SetInputVersionNumber(int value) => InputVersionNumber = value; + private void SetInputVersionNumber(int value) => _inputVersionNumber = value; /// Returns the value of the InputVersionNumber. /// The value of the InputVersionNumber. - private int GetInputVersionNumber() => InputVersionNumber; + private int GetInputVersionNumber() => _inputVersionNumber; #endregion @@ -122,7 +120,7 @@ private void UpdateState() bool length = krtbInput.Text.Length > 0; bool flag0 = ValidOutputDirectory(krtbOutput.Text); bool flag1 = ValidOutputFilename(krtbOutput.Text); - bool flag2 = (GetInputVersionNumber() >= MINIMUM_PALETTE_FILE_VERSION && GetInputVersionNumber() <= MAXIMUM_PALETTE_FILE_VERSION); + bool flag2 = (GetInputVersionNumber() >= MINIMUM_PALETTE_FILE_VERSION && GetInputVersionNumber() < MAXIMUM_PALETTE_FILE_VERSION); kbtnUpgrade.Enabled = (length && flag0 && flag1 && flag2); @@ -130,9 +128,7 @@ private void UpdateState() { klblStatus.ForeColor = Color.Green; - int num = MAXIMUM_PALETTE_FILE_VERSION + 1; - - klblStatus.Text = $"Convert to output version ' {num}'."; + klblStatus.Text = $"Convert to output version ' {MAXIMUM_PALETTE_FILE_VERSION}'."; return; } @@ -213,7 +209,7 @@ private void kbtnUpgrade_Click(object sender, EventArgs e) { try { - StreamReader reader = new StreamReader(krtbInput.Text); + var reader = new StreamReader(krtbInput.Text); string end = reader.ReadToEnd(); @@ -226,9 +222,9 @@ private void kbtnUpgrade_Click(object sender, EventArgs e) xslCompiledTransform.Load(new XmlTextReader(new StringReader(Resources.v2to6))); end = TransformXml(xslCompiledTransform, end); } - else if (GetInputVersionNumber() <= MAXIMUM_PALETTE_FILE_VERSION) + else if (GetInputVersionNumber() < MAXIMUM_PALETTE_FILE_VERSION) { - var streamReader = new StringReader(Resources.v6to19); + var streamReader = new StringReader(Resources.v6to20); var xmlTextReader = XmlReader.Create(streamReader); var xslCompiledTransform1 = new XslCompiledTransform(); xslCompiledTransform1.Load(xmlTextReader); @@ -245,7 +241,7 @@ private void kbtnUpgrade_Click(object sender, EventArgs e) writer.Close(); - object[] text = ["Input file: ", krtbInput.Text, "\nOutput file: ", krtbOutput.Text, "\n\nUpgrade from version '", InputVersionNumber, "' to version '", 19.ToString(), "' has succeeded." + object[] text = ["Input file: ", krtbInput.Text, "\nOutput file: ", krtbOutput.Text, "\n\nUpgrade from version '", _inputVersionNumber, "' to version '", MAXIMUM_PALETTE_FILE_VERSION.ToString(), "' has succeeded." ]; KryptonMessageBox.Show(this, string.Concat(text), "Upgrade Success", KryptonMessageBoxButtons.OK, KryptonMessageBoxIcon.Information); @@ -291,7 +287,7 @@ private void kcmdBrowseForOriginalFile_Execute(object sender, EventArgs e) KryptonMessageBoxIcon.Warning); break; } - case <= MAXIMUM_PALETTE_FILE_VERSION: + case < MAXIMUM_PALETTE_FILE_VERSION: { krtbInput.Text = openFileDialog.FileName; @@ -358,7 +354,7 @@ private void kcmdBrowseForUpgradedFile_Execute(object sender, EventArgs e) if (saveFileDialog.ShowDialog() == DialogResult.OK) { - StreamWriter writer = new StreamWriter(Path.GetFullPath(saveFileDialog.FileName)); + var writer = new StreamWriter(Path.GetFullPath(saveFileDialog.FileName)); writer.Write(krtbOutput.Text); diff --git a/Applications/Source/Palette Designer/FormPaletteUpgradeTool.resx b/Applications/Source/Palette Designer/FormPaletteUpgradeTool.resx index bf2f2f7..bc912c3 100644 --- a/Applications/Source/Palette Designer/FormPaletteUpgradeTool.resx +++ b/Applications/Source/Palette Designer/FormPaletteUpgradeTool.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 217, 17 + @@ -165,7 +168,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAABx9JREFUeF7tm+lWE0kU + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAABx9JREFUeF7tm+lWE0kU x30AH8U3mPngS8w58wQz58ycMzpfFBfcFcWVTUAWFZWwDIvI4g4CKiqC4AoKWcgCSQhLAiGAc6f+BR27 qysb0H0GCOf8ThL63uquf1dX1b1VvQN/RLSLsXs7MU7enbzyEYrsGl78utQZ6qbtQxcVD5ZYuABj5Nrd EmyjxkATtQbaqMHXsGWpZ9T4a8nir6bDdzPbNQLUTzbS/pF9W54DIxmUN1CgF8Diq+IG72ae0NfQCxqY @@ -202,9 +205,6 @@ 17, 17 - - 217, 17 - AAABAAUAMDAAAAEAIACoJQAAVgAAACAgAAABACAAqBAAAP4lAAAgIAAAAQAIAKgIAACmNgAAEBAAAAEA diff --git a/Applications/Source/Palette Designer/MainForm.Designer.cs b/Applications/Source/Palette Designer/MainForm.Designer.cs index f2224d4..f23a11e 100644 --- a/Applications/Source/Palette Designer/MainForm.Designer.cs +++ b/Applications/Source/Palette Designer/MainForm.Designer.cs @@ -32,12 +32,18 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("Item1"); - System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("Item 2"); - System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("Item1"); - System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem("Item 2"); - System.Windows.Forms.ListViewItem listViewItem5 = new System.Windows.Forms.ListViewItem("Item1"); - System.Windows.Forms.ListViewItem listViewItem6 = new System.Windows.Forms.ListViewItem("Item 2"); + System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] { + "Item1"}, -1, System.Drawing.SystemColors.ControlText, System.Drawing.SystemColors.Window, new System.Drawing.Font("Segoe UI", 9F)); + System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] { + "Item 2"}, -1, System.Drawing.SystemColors.ControlText, System.Drawing.SystemColors.Window, new System.Drawing.Font("Segoe UI", 9F)); + System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem(new string[] { + "Item1"}, -1, System.Drawing.SystemColors.ControlText, System.Drawing.SystemColors.Window, new System.Drawing.Font("Segoe UI", 9F)); + System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem(new string[] { + "Item 2"}, -1, System.Drawing.SystemColors.ControlText, System.Drawing.SystemColors.Window, new System.Drawing.Font("Segoe UI", 9F)); + System.Windows.Forms.ListViewItem listViewItem5 = new System.Windows.Forms.ListViewItem(new string[] { + "Item1"}, -1, System.Drawing.SystemColors.ControlText, System.Drawing.SystemColors.Window, new System.Drawing.Font("Segoe UI", 9F)); + System.Windows.Forms.ListViewItem listViewItem6 = new System.Windows.Forms.ListViewItem(new string[] { + "Item 2"}, -1, System.Drawing.SystemColors.ControlText, System.Drawing.SystemColors.Window, new System.Drawing.Font("Segoe UI", 9F)); this.mainMenuStrip = new System.Windows.Forms.MenuStrip(); this.menuFile = new System.Windows.Forms.ToolStripMenuItem(); this.menuNew = new System.Windows.Forms.ToolStripMenuItem(); @@ -362,7 +368,7 @@ private void InitializeComponent() this.pageDesignToolTips = new Krypton.Navigator.KryptonPage(); this.toolTipsPage1 = new PaletteDesigner.Pages.ToolTipsPage(); this.kryptonHeaderGroupProperties = new Krypton.Toolkit.KryptonHeaderGroup(); - this.propertyGrid = new Krypton.Toolkit.KryptonPropertyGrid(); + this.propertyGrid = new System.Windows.Forms.PropertyGrid(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -1295,16 +1301,11 @@ private void InitializeComponent() this.kryptonListView3.Items.AddRange(new System.Windows.Forms.ListViewItem[] { listViewItem1, listViewItem2}); - this.kryptonListView3.ItemStyle = Krypton.Toolkit.ButtonStyle.ListItem; this.kryptonListView3.Location = new System.Drawing.Point(212, 14); this.kryptonListView3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonListView3.Name = "kryptonListView3"; - this.kryptonListView3.OwnerDraw = true; this.kryptonListView3.PaletteMode = Krypton.Toolkit.PaletteMode.ProfessionalSystem; this.kryptonListView3.Size = new System.Drawing.Size(224, 132); - this.kryptonListView3.StateCommon.Item.Content.ShortText.MultiLine = Krypton.Toolkit.InheritBool.True; - this.kryptonListView3.StateCommon.Item.Content.ShortText.MultiLineH = Krypton.Toolkit.PaletteRelativeAlign.Center; - this.kryptonListView3.StateCommon.Item.Content.ShortText.TextH = Krypton.Toolkit.PaletteRelativeAlign.Center; this.kryptonListView3.TabIndex = 1; // // kryptonListBox3 @@ -1342,7 +1343,6 @@ private void InitializeComponent() // // kryptonListView2 // - this.kryptonListView2.AlwaysActive = false; this.kryptonListView2.CheckBoxes = true; this.kryptonListView2.FullRowSelect = true; this.kryptonListView2.GridLines = true; @@ -1352,16 +1352,11 @@ private void InitializeComponent() this.kryptonListView2.Items.AddRange(new System.Windows.Forms.ListViewItem[] { listViewItem3, listViewItem4}); - this.kryptonListView2.ItemStyle = Krypton.Toolkit.ButtonStyle.ListItem; this.kryptonListView2.Location = new System.Drawing.Point(212, 14); this.kryptonListView2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonListView2.Name = "kryptonListView2"; - this.kryptonListView2.OwnerDraw = true; this.kryptonListView2.PaletteMode = Krypton.Toolkit.PaletteMode.ProfessionalSystem; this.kryptonListView2.Size = new System.Drawing.Size(224, 132); - this.kryptonListView2.StateCommon.Item.Content.ShortText.MultiLine = Krypton.Toolkit.InheritBool.True; - this.kryptonListView2.StateCommon.Item.Content.ShortText.MultiLineH = Krypton.Toolkit.PaletteRelativeAlign.Center; - this.kryptonListView2.StateCommon.Item.Content.ShortText.TextH = Krypton.Toolkit.PaletteRelativeAlign.Center; this.kryptonListView2.TabIndex = 1; // // kryptonListBox2 @@ -1414,16 +1409,11 @@ private void InitializeComponent() this.kryptonListView1.Items.AddRange(new System.Windows.Forms.ListViewItem[] { listViewItem5, listViewItem6}); - this.kryptonListView1.ItemStyle = Krypton.Toolkit.ButtonStyle.ListItem; this.kryptonListView1.Location = new System.Drawing.Point(212, 14); this.kryptonListView1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonListView1.Name = "kryptonListView1"; - this.kryptonListView1.OwnerDraw = true; this.kryptonListView1.PaletteMode = Krypton.Toolkit.PaletteMode.ProfessionalSystem; this.kryptonListView1.Size = new System.Drawing.Size(224, 132); - this.kryptonListView1.StateCommon.Item.Content.ShortText.MultiLine = Krypton.Toolkit.InheritBool.True; - this.kryptonListView1.StateCommon.Item.Content.ShortText.MultiLineH = Krypton.Toolkit.PaletteRelativeAlign.Center; - this.kryptonListView1.StateCommon.Item.Content.ShortText.TextH = Krypton.Toolkit.PaletteRelativeAlign.Center; this.kryptonListView1.TabIndex = 1; // // kryptonListBox1 @@ -3160,6 +3150,7 @@ private void InitializeComponent() this.labelsControlToolTip.Name = "labelsControlToolTip"; this.labelsControlToolTip.Size = new System.Drawing.Size(168, 32); this.labelsControlToolTip.TabIndex = 29; + this.labelsControlToolTip.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.labelsControlToolTip.Values.Text = "Control - ToolTip"; // // labelsControlCustom1 @@ -3170,6 +3161,7 @@ private void InitializeComponent() this.labelsControlCustom1.Name = "labelsControlCustom1"; this.labelsControlCustom1.Size = new System.Drawing.Size(187, 32); this.labelsControlCustom1.TabIndex = 28; + this.labelsControlCustom1.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.labelsControlCustom1.Values.Text = "Control - Custom 1"; // // labelsControlAlternate @@ -3180,6 +3172,7 @@ private void InitializeComponent() this.labelsControlAlternate.Name = "labelsControlAlternate"; this.labelsControlAlternate.Size = new System.Drawing.Size(183, 32); this.labelsControlAlternate.TabIndex = 27; + this.labelsControlAlternate.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.labelsControlAlternate.Values.Text = "Control - Alternate"; // // labelsControlClient @@ -3190,6 +3183,7 @@ private void InitializeComponent() this.labelsControlClient.Name = "labelsControlClient"; this.labelsControlClient.Size = new System.Drawing.Size(153, 32); this.labelsControlClient.TabIndex = 26; + this.labelsControlClient.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.labelsControlClient.Values.Text = "Control - Client"; // // labelsPanelCustom1 @@ -3200,6 +3194,7 @@ private void InitializeComponent() this.labelsPanelCustom1.Name = "labelsPanelCustom1"; this.labelsPanelCustom1.Size = new System.Drawing.Size(168, 32); this.labelsPanelCustom1.TabIndex = 25; + this.labelsPanelCustom1.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.labelsPanelCustom1.Values.Text = "Panel - Custom 1"; // // labelsPanelAlternate @@ -3210,6 +3205,7 @@ private void InitializeComponent() this.labelsPanelAlternate.Name = "labelsPanelAlternate"; this.labelsPanelAlternate.Size = new System.Drawing.Size(165, 32); this.labelsPanelAlternate.TabIndex = 24; + this.labelsPanelAlternate.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.labelsPanelAlternate.Values.Text = "Panel - Alternate"; // // labelsPanelClient @@ -3221,6 +3217,7 @@ private void InitializeComponent() this.labelsPanelClient.Name = "labelsPanelClient"; this.labelsPanelClient.Size = new System.Drawing.Size(153, 32); this.labelsPanelClient.TabIndex = 23; + this.labelsPanelClient.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.labelsPanelClient.Values.Text = "Panel - Client"; // // panelLabelsBackground @@ -4970,26 +4967,17 @@ private void InitializeComponent() this.kryptonHeaderGroupProperties.ValuesPrimary.Heading = "Properties"; this.kryptonHeaderGroupProperties.ValuesPrimary.Image = null; // - // labelGridNormal + // propertyGrid // this.propertyGrid.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.propertyGrid.CategoryForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(57)))), ((int)(((byte)(91))))); - this.propertyGrid.CommandsBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.propertyGrid.CommandsForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(57)))), ((int)(((byte)(91))))); - this.propertyGrid.DisabledItemForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(30)))), ((int)(((byte)(57)))), ((int)(((byte)(91))))); this.propertyGrid.Dock = System.Windows.Forms.DockStyle.Fill; this.propertyGrid.Font = new System.Drawing.Font("Segoe UI", 9F); - this.propertyGrid.HelpBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(187)))), ((int)(((byte)(206)))), ((int)(((byte)(230))))); - this.propertyGrid.HelpForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(57)))), ((int)(((byte)(91))))); - this.propertyGrid.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(179)))), ((int)(((byte)(196)))), ((int)(((byte)(216))))); this.propertyGrid.Location = new System.Drawing.Point(0, 0); this.propertyGrid.Margin = new System.Windows.Forms.Padding(4); this.propertyGrid.Name = "propertyGrid"; this.propertyGrid.Size = new System.Drawing.Size(662, 697); this.propertyGrid.TabIndex = 0; this.propertyGrid.ToolbarVisible = false; - this.propertyGrid.ViewBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.propertyGrid.ViewForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(57)))), ((int)(((byte)(91))))); this.propertyGrid.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.propertyGrid_PropertyValueChanged); // // dataGridViewTextBoxColumn1 @@ -5438,7 +5426,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem menuSaveAs; private System.Windows.Forms.ToolStripSeparator menuSep2; private System.Windows.Forms.ToolStripMenuItem menuExit; - private Krypton.Toolkit.KryptonPropertyGrid propertyGrid; + private System.Windows.Forms.PropertyGrid propertyGrid; private Krypton.Toolkit.KryptonPanel borderDesignControls; private Krypton.Toolkit.KryptonLabel labelControlsNormal; private Krypton.Toolkit.KryptonLabel labelControlsDisabled; diff --git a/Applications/Source/Palette Designer/MainForm.cs b/Applications/Source/Palette Designer/MainForm.cs index 6c9a555..023ec75 100644 --- a/Applications/Source/Palette Designer/MainForm.cs +++ b/Applications/Source/Palette Designer/MainForm.cs @@ -327,8 +327,8 @@ private void Open() // Use the new instance instead _palette = palette; - _chromeTMS.Palette = palette; - _chromeTMS2.Palette = palette; + _chromeTMS.LocalCustomPalette = palette; + _chromeTMS2.LocalCustomPalette = palette; _chromeRibbon.OverridePalette = _palette; // We need to know when a change occurs to the palette settings @@ -451,8 +451,8 @@ private void CreateNewPalette() // Create a fresh palette instance _palette = new KryptonCustomPaletteBase(); - _chromeTMS.Palette = _palette; - _chromeTMS2.Palette = _palette; + _chromeTMS.LocalCustomPalette = _palette; + _chromeTMS2.LocalCustomPalette = _palette; _chromeRibbon.OverridePalette = _palette; // We need to know when a change occurs to the palette settings @@ -488,12 +488,12 @@ private void ApplyPalette() return; } - _applyPalettesToBases.ForEach(vcb => vcb.Palette = _palette); + _applyPalettesToBases.ForEach(vcb => vcb.LocalCustomPalette = _palette); _applyPalettesToPanels.ForEach(pnl => pnl.Palette = _palette); dataGridViewDisabled.Palette = _palette; dataGridViewNormal.Palette = _palette; - kryptonListView1.Palette = _palette; + kryptonListView1.LocalCustomPalette = _palette; inputControls1.ApplyPalette(_palette); trackBar1.ApplyPalette(_palette); @@ -979,9 +979,6 @@ private void MyOwnRecentPaletteFilesGotCleared_Handler(object sender, EventArgs private void LaunchPaletteUpgradeToolToolStripMenuItem_Click(object sender, EventArgs e) { - // TODO: Why doesn't this work? - //using FormPaletteUpgradeTool paletteUpgradeTool = new(); - var paletteUpgradeTool = new FormPaletteUpgradeTool(); paletteUpgradeTool.Show(); @@ -989,9 +986,6 @@ private void LaunchPaletteUpgradeToolToolStripMenuItem_Click(object sender, Even private void SettingsToolStripMenuItem_Click(object sender, EventArgs e) { - // TODO: Why doesn't this work? - //using var controlPanel = new SettingsControlPanel(); - var controlPanel = new SettingsControlPanel(); controlPanel.Show(); diff --git a/Applications/Source/Palette Designer/Pages/ButtonsPage.Designer.cs b/Applications/Source/Palette Designer/Pages/ButtonsPage.Designer.cs index fa280d4..074dd3f 100644 --- a/Applications/Source/Palette Designer/Pages/ButtonsPage.Designer.cs +++ b/Applications/Source/Palette Designer/Pages/ButtonsPage.Designer.cs @@ -145,7 +145,6 @@ private void InitializeComponent() this.kryptonButton10.Location = new System.Drawing.Point(4, 4); this.kryptonButton10.Margin = new System.Windows.Forms.Padding(4); this.kryptonButton10.Name = "kryptonButton10"; - this.kryptonButton10.ShowSplitOption = true; this.kryptonButton10.Size = new System.Drawing.Size(159, 36); this.kryptonButton10.TabIndex = 19; this.kryptonButton10.Values.Image = global::PaletteDesigner.Properties.Resources.AppMenuClose; diff --git a/Applications/Source/Palette Designer/Pages/ButtonsPage.cs b/Applications/Source/Palette Designer/Pages/ButtonsPage.cs index b2139df..ae0266e 100644 --- a/Applications/Source/Palette Designer/Pages/ButtonsPage.cs +++ b/Applications/Source/Palette Designer/Pages/ButtonsPage.cs @@ -3,11 +3,15 @@ * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2024 - 2024. All rights reserved. */ +using Krypton.Toolkit; + namespace PaletteDesigner.Pages; public partial class ButtonsPage : UserControl { - private readonly List _pageButtons; + private readonly List _pageButtons; + private readonly List _pageButtons2; + private readonly List _kryptonGroupBoxs; public ButtonsPage() { @@ -36,7 +40,7 @@ public ButtonsPage() _pageButtons = [ - ..new[] + ..new [] { buttonDisabled, buttonDefaultFocus, @@ -47,12 +51,6 @@ public ButtonsPage() buttonCheckedTracking, buttonCheckedPressed, buttonLive, - kryptonDropButton1, - kryptonDropButton2, - kryptonDropButton3, - kryptonDropButton4, - kryptonDropButton5, - kryptonDropButton6, kryptonButton10, kryptonButton11, kryptonButton12, @@ -62,6 +60,27 @@ public ButtonsPage() } ]; + _pageButtons2 = + [ + ..new[] + { + kryptonDropButton1, + kryptonDropButton2, + kryptonDropButton3, + kryptonDropButton4, + kryptonDropButton5, + kryptonDropButton6, + } + ]; + _kryptonGroupBoxs = + [ + ..new[] + { + kryptonGroupBox1, + kryptonGroupBox2, + kryptonGroupBox3 + } + ]; //_pageButtons = //[ // ..new[] @@ -92,8 +111,10 @@ public ButtonsPage() public void ApplyPalette(KryptonCustomPaletteBase palette) { - _pageButtons.ForEach(control => control.Palette = palette); - kryptonColorButton1.Palette = palette; + _pageButtons.ForEach(control => control.LocalCustomPalette = palette); + _pageButtons2.ForEach(control => control.LocalCustomPalette = palette); + _kryptonGroupBoxs.ForEach(control => control.LocalCustomPalette = palette); + kryptonColorButton1.LocalCustomPalette = palette; kryptonPanel1.Palette = palette; } @@ -135,6 +156,7 @@ private void kryptonNavigatorDesignButtons_SelectedPageChanged(object sender, Ev // Update all the displayed buttons with the new style _pageButtons.ForEach(control => control.ButtonStyle = bs); + _pageButtons2.ForEach(control => control.ButtonStyle = bs); kryptonColorButton1.ButtonStyle = bs; } } \ No newline at end of file diff --git a/Applications/Source/Palette Designer/Pages/InputControls.cs b/Applications/Source/Palette Designer/Pages/InputControls.cs index 5a0853e..94c0e1b 100644 --- a/Applications/Source/Palette Designer/Pages/InputControls.cs +++ b/Applications/Source/Palette Designer/Pages/InputControls.cs @@ -1,9 +1,7 @@ #region BSD License /* - * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. - * + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. */ #endregion @@ -83,10 +81,10 @@ public InputControls() public void ApplyPalette(KryptonCustomPaletteBase palette) { - _textBoxes.ForEach(control => control.Palette = palette); - _comboBoxes.ForEach(control => control.Palette = palette); - _richTextBoxes.ForEach(control => control.Palette = palette); - _numericUpDowns.ForEach(control => control.Palette = palette); + _textBoxes.ForEach(control => control.LocalCustomPalette = palette); + _comboBoxes.ForEach(control => control.LocalCustomPalette = palette); + _richTextBoxes.ForEach(control => control.LocalCustomPalette = palette); + _numericUpDowns.ForEach(control => control.LocalCustomPalette = palette); kryptonPanel1.Palette = palette; } diff --git a/Applications/Source/Palette Designer/Pages/MenuPage.cs b/Applications/Source/Palette Designer/Pages/MenuPage.cs index 7147373..db4aa54 100644 --- a/Applications/Source/Palette Designer/Pages/MenuPage.cs +++ b/Applications/Source/Palette Designer/Pages/MenuPage.cs @@ -1,9 +1,7 @@ #region BSD License /* - * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. - * + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. */ #endregion @@ -32,7 +30,7 @@ public MenuPage() public void ApplyPalette(KryptonCustomPaletteBase palette) { - kcmEverything.Palette = palette; + kcmEverything.LocalCustomPalette = palette; kryptonPanel1.Palette = palette; } diff --git a/Applications/Source/Palette Designer/Pages/ToolTipsPage.Designer.cs b/Applications/Source/Palette Designer/Pages/ToolTipsPage.Designer.cs index 4ff014c..20bf7b0 100644 --- a/Applications/Source/Palette Designer/Pages/ToolTipsPage.Designer.cs +++ b/Applications/Source/Palette Designer/Pages/ToolTipsPage.Designer.cs @@ -30,12 +30,12 @@ private void InitializeComponent() { this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel(); this.kryptonGroupBox1 = new Krypton.Toolkit.KryptonGroupBox(); + this.comboBoxLabelStyles = new Krypton.Toolkit.KryptonComboBox(); this.kchkShowImage = new Krypton.Toolkit.KryptonCheckBox(); this.krbKeyTip = new Krypton.Toolkit.KryptonRadioButton(); this.krbSuperTip = new Krypton.Toolkit.KryptonRadioButton(); this.krbToolTip = new Krypton.Toolkit.KryptonRadioButton(); this.kryptonButton1 = new Krypton.Toolkit.KryptonButton(); - this.comboBoxLabelStyles = new Krypton.Toolkit.KryptonComboBox(); ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit(); this.kryptonPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.kryptonGroupBox1)).BeginInit(); @@ -51,15 +51,16 @@ private void InitializeComponent() this.kryptonPanel1.Controls.Add(this.kryptonButton1); this.kryptonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.kryptonPanel1.Location = new System.Drawing.Point(0, 0); - this.kryptonPanel1.Margin = new System.Windows.Forms.Padding(2); + this.kryptonPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonPanel1.Name = "kryptonPanel1"; - this.kryptonPanel1.Size = new System.Drawing.Size(650, 544); + this.kryptonPanel1.Size = new System.Drawing.Size(867, 670); this.kryptonPanel1.TabIndex = 1; // // kryptonGroupBox1 // - this.kryptonGroupBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.kryptonGroupBox1.Location = new System.Drawing.Point(0, 470); + this.kryptonGroupBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.kryptonGroupBox1.Location = new System.Drawing.Point(0, 0); + this.kryptonGroupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonGroupBox1.Name = "kryptonGroupBox1"; // // kryptonGroupBox1.Panel @@ -69,17 +70,31 @@ private void InitializeComponent() this.kryptonGroupBox1.Panel.Controls.Add(this.krbKeyTip); this.kryptonGroupBox1.Panel.Controls.Add(this.krbSuperTip); this.kryptonGroupBox1.Panel.Controls.Add(this.krbToolTip); - this.kryptonGroupBox1.Size = new System.Drawing.Size(650, 74); + this.kryptonGroupBox1.Size = new System.Drawing.Size(867, 91); this.kryptonGroupBox1.TabIndex = 2; this.kryptonGroupBox1.Values.Heading = "Tool Tip Types"; // + // comboBoxLabelStyles + // + this.comboBoxLabelStyles.AlwaysActive = false; + this.comboBoxLabelStyles.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxLabelStyles.DropDownWidth = 121; + this.comboBoxLabelStyles.IntegralHeight = false; + this.comboBoxLabelStyles.Location = new System.Drawing.Point(372, 18); + this.comboBoxLabelStyles.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.comboBoxLabelStyles.Name = "comboBoxLabelStyles"; + this.comboBoxLabelStyles.Size = new System.Drawing.Size(204, 26); + this.comboBoxLabelStyles.TabIndex = 23; + this.comboBoxLabelStyles.SelectedIndexChanged += new System.EventHandler(this.comboBoxLabelStyles_SelectedIndexChanged); + // // kchkShowImage // this.kchkShowImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.kchkShowImage.Location = new System.Drawing.Point(499, 17); + this.kchkShowImage.Location = new System.Drawing.Point(684, 21); + this.kchkShowImage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kchkShowImage.Name = "kchkShowImage"; - this.kchkShowImage.Size = new System.Drawing.Size(135, 20); + this.kchkShowImage.Size = new System.Drawing.Size(163, 24); this.kchkShowImage.TabIndex = 3; this.kchkShowImage.Values.Text = "Show ToolTip &Image"; this.kchkShowImage.CheckedChanged += new System.EventHandler(this.kchkShowImage_CheckedChanged); @@ -88,9 +103,10 @@ private void InitializeComponent() // this.krbKeyTip.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.krbKeyTip.Location = new System.Drawing.Point(163, 17); + this.krbKeyTip.Location = new System.Drawing.Point(217, 21); + this.krbKeyTip.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.krbKeyTip.Name = "krbKeyTip"; - this.krbKeyTip.Size = new System.Drawing.Size(59, 20); + this.krbKeyTip.Size = new System.Drawing.Size(69, 24); this.krbKeyTip.TabIndex = 2; this.krbKeyTip.Values.Text = "&KeyTip"; this.krbKeyTip.CheckedChanged += new System.EventHandler(this.krbKeyTip_CheckedChanged); @@ -100,9 +116,10 @@ private void InitializeComponent() this.krbSuperTip.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.krbSuperTip.Checked = true; - this.krbSuperTip.Location = new System.Drawing.Point(85, 17); + this.krbSuperTip.Location = new System.Drawing.Point(113, 21); + this.krbSuperTip.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.krbSuperTip.Name = "krbSuperTip"; - this.krbSuperTip.Size = new System.Drawing.Size(71, 20); + this.krbSuperTip.Size = new System.Drawing.Size(84, 24); this.krbSuperTip.TabIndex = 1; this.krbSuperTip.Values.Text = "S&uperTip"; this.krbSuperTip.CheckedChanged += new System.EventHandler(this.krbSuperTip_CheckedChanged); @@ -111,45 +128,36 @@ private void InitializeComponent() // this.krbToolTip.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.krbToolTip.Location = new System.Drawing.Point(15, 18); + this.krbToolTip.Location = new System.Drawing.Point(20, 22); + this.krbToolTip.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.krbToolTip.Name = "krbToolTip"; - this.krbToolTip.Size = new System.Drawing.Size(63, 20); + this.krbToolTip.Size = new System.Drawing.Size(74, 24); this.krbToolTip.TabIndex = 0; this.krbToolTip.Values.Text = "&ToolTip"; this.krbToolTip.CheckedChanged += new System.EventHandler(this.krbToolTip_CheckedChanged); // // kryptonButton1 // - this.kryptonButton1.Location = new System.Drawing.Point(40, 61); - this.kryptonButton1.Margin = new System.Windows.Forms.Padding(2); + this.kryptonButton1.Location = new System.Drawing.Point(48, 144); + this.kryptonButton1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.kryptonButton1.Name = "kryptonButton1"; - this.kryptonButton1.Size = new System.Drawing.Size(180, 35); + this.kryptonButton1.Size = new System.Drawing.Size(240, 43); this.kryptonButton1.TabIndex = 1; this.kryptonButton1.ToolTipValues.Description = "This is a Krypton ToolTip. There are three types, they are:-\r\n - ToolTip\r\n " + "- SuperTip\r\n - KeyTip"; this.kryptonButton1.ToolTipValues.EnableToolTips = true; this.kryptonButton1.ToolTipValues.Heading = "Krypton ToolTip Example"; + this.kryptonButton1.Values.DropDownArrowColor = System.Drawing.Color.Empty; this.kryptonButton1.Values.Text = "Hover Over Me"; // - // comboBoxLabelStyles - // - this.comboBoxLabelStyles.AlwaysActive = false; - this.comboBoxLabelStyles.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxLabelStyles.DropDownWidth = 121; - this.comboBoxLabelStyles.IntegralHeight = false; - this.comboBoxLabelStyles.Location = new System.Drawing.Point(279, 15); - this.comboBoxLabelStyles.Name = "comboBoxLabelStyles"; - this.comboBoxLabelStyles.Size = new System.Drawing.Size(153, 21); - this.comboBoxLabelStyles.TabIndex = 23; - this.comboBoxLabelStyles.SelectedIndexChanged += new System.EventHandler(this.comboBoxLabelStyles_SelectedIndexChanged); - // // ToolTipsPage // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.kryptonPanel1); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "ToolTipsPage"; - this.Size = new System.Drawing.Size(650, 544); + this.Size = new System.Drawing.Size(867, 670); ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).EndInit(); this.kryptonPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.kryptonGroupBox1.Panel)).EndInit(); diff --git a/Applications/Source/Palette Designer/Pages/ToolTipsPage.cs b/Applications/Source/Palette Designer/Pages/ToolTipsPage.cs index 740c472..4525d79 100644 --- a/Applications/Source/Palette Designer/Pages/ToolTipsPage.cs +++ b/Applications/Source/Palette Designer/Pages/ToolTipsPage.cs @@ -1,9 +1,7 @@ #region BSD License /* - * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. - * + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. */ #endregion @@ -25,17 +23,17 @@ public void ApplyPalette(KryptonCustomPaletteBase palette) { kryptonPanel1.Palette = palette; - kryptonButton1.Palette = palette; + kryptonButton1.LocalCustomPalette = palette; - kryptonGroupBox1.Palette = palette; + kryptonGroupBox1.LocalCustomPalette = palette; - krbToolTip.Palette = palette; + krbToolTip.LocalCustomPalette = palette; - krbSuperTip.Palette = palette; + krbSuperTip.LocalCustomPalette = palette; - krbKeyTip.Palette = palette; + krbKeyTip.LocalCustomPalette = palette; - kchkShowImage.Palette = palette; + kchkShowImage.LocalCustomPalette = palette; } private void kchkShowImage_CheckedChanged(object sender, EventArgs e) diff --git a/Applications/Source/Palette Designer/Pages/TrackBar.cs b/Applications/Source/Palette Designer/Pages/TrackBar.cs index d36b2ee..b6a3668 100644 --- a/Applications/Source/Palette Designer/Pages/TrackBar.cs +++ b/Applications/Source/Palette Designer/Pages/TrackBar.cs @@ -1,9 +1,7 @@ #region BSD License /* - * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. - * + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. */ #endregion @@ -63,7 +61,7 @@ public TrackBar() public void ApplyPalette(KryptonCustomPaletteBase palette) { - _tBars.ForEach(bar => bar.Palette = palette); + _tBars.ForEach(bar => bar.LocalCustomPalette = palette); kryptonPanel1.Palette = palette; } diff --git a/Applications/Source/Palette Designer/Palette Designer 2022 - Nuget.sln b/Applications/Source/Palette Designer/Palette Designer 2022 - Nuget.sln index 7f55566..fa63636 100644 --- a/Applications/Source/Palette Designer/Palette Designer 2022 - Nuget.sln +++ b/Applications/Source/Palette Designer/Palette Designer 2022 - Nuget.sln @@ -1,25 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29521.150 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35527.113 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Palette Designer 2019", "Palette Designer 2019.csproj", "{A9435693-714C-47AB-BF4F-115AF7D568CC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D6EA0EB0-9DB1-43DC-BCB5-4017C3935CC3}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Palette Designer 2022", "Palette Designer 2022.csproj", "{6B28CF7A-F38F-41E8-8FD7-D7E122151E10}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A9435693-714C-47AB-BF4F-115AF7D568CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9435693-714C-47AB-BF4F-115AF7D568CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9435693-714C-47AB-BF4F-115AF7D568CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9435693-714C-47AB-BF4F-115AF7D568CC}.Release|Any CPU.Build.0 = Release|Any CPU + {6B28CF7A-F38F-41E8-8FD7-D7E122151E10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B28CF7A-F38F-41E8-8FD7-D7E122151E10}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B28CF7A-F38F-41E8-8FD7-D7E122151E10}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B28CF7A-F38F-41E8-8FD7-D7E122151E10}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Applications/Source/Palette Designer/Palette Designer 2022 - Nuget.sln.DotSettings b/Applications/Source/Palette Designer/Palette Designer 2022 - Nuget.sln.DotSettings new file mode 100644 index 0000000..ccbf55b --- /dev/null +++ b/Applications/Source/Palette Designer/Palette Designer 2022 - Nuget.sln.DotSettings @@ -0,0 +1,3 @@ + + True + True \ No newline at end of file diff --git a/Applications/Source/Palette Designer/Palette Designer 2022.csproj b/Applications/Source/Palette Designer/Palette Designer 2022.csproj index 24c98a9..e49733f 100644 --- a/Applications/Source/Palette Designer/Palette Designer 2022.csproj +++ b/Applications/Source/Palette Designer/Palette Designer 2022.csproj @@ -1,8 +1,10 @@  - net48;net481;net6.0-windows;net7.0-windows;net8.0-windows + net48;net481;net8.0-windows;net9.0-windows WinExe true + ..\..\Binaries\Krypton Palette\$(Configuration)\ + app.manifest PaletteDesigner Palette Designer Krypton.ico @@ -37,9 +39,8 @@ - - - + + @@ -85,10 +86,4 @@ - - ..\..\Binaries\Krypton Demos\$(Configuration)\ - app.manifest - enable - - \ No newline at end of file diff --git a/Applications/Source/Palette Designer/Properties/AssemblyInfo.cs b/Applications/Source/Palette Designer/Properties/AssemblyInfo.cs index a9b9f7e..018700a 100644 --- a/Applications/Source/Palette Designer/Properties/AssemblyInfo.cs +++ b/Applications/Source/Palette Designer/Properties/AssemblyInfo.cs @@ -15,12 +15,11 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyVersion("5.500.6011.0")] -[assembly: AssemblyFileVersion("5.500.6011.0")] -[assembly: AssemblyInformationalVersion("4.5.11.0")] -[assembly: AssemblyCopyright("© Component Factory Pty Ltd, 2006 - 2016. All rights reserved.")] +[assembly: AssemblyVersion("90.24.11.317")] +[assembly: AssemblyFileVersion("90.24.11.317")] +[assembly: AssemblyInformationalVersion("90.24.11.317")] +[assembly: AssemblyCopyright("© Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024.")] [assembly: AssemblyProduct("Palette Designer")] -[assembly: AssemblyDefaultAlias("PaletteDesigner.dll")] [assembly: AssemblyTitle("Palette Designer")] [assembly: AssemblyCompany("Component Factory")] [assembly: AssemblyDescription("Palette Designer")] @@ -34,3 +33,4 @@ [assembly: Dependency("System.Windows.Forms", LoadHint.Always)] [assembly: Dependency("Krypton.Toolkit", LoadHint.Always)] [assembly: Dependency("Krypton.Navigator", LoadHint.Always)] +[assembly: Dependency("Krypton.Ribbon", LoadHint.Always)] diff --git a/Applications/Source/Palette Designer/Properties/Resources.Designer.cs b/Applications/Source/Palette Designer/Properties/Resources.Designer.cs index 64ace7a..33a0600 100644 --- a/Applications/Source/Palette Designer/Properties/Resources.Designer.cs +++ b/Applications/Source/Palette Designer/Properties/Resources.Designer.cs @@ -413,12 +413,12 @@ internal static string v2to6 { /// <xsl:comment>Created by exporting the settings of a KryptonPalette instance.</xsl:comment> /// <xsl:comment>For more information about Krypton visit https://github.com/Krypton-Suite/Standard-Toolkit</xsl:comment> /// <xsl:comment>WARNING: Modifying this file may render it invalid for importing.</xsl:comment> - /// <KryptonPalette Version="19"> + /// <KryptonPalette Version="20"> /// <xsl:attr [rest of string was truncated]";. /// - internal static string v6to19 { + internal static string v6to20 { get { - return ResourceManager.GetString("v6to19", resourceCulture); + return ResourceManager.GetString("v6to20", resourceCulture); } } } diff --git a/Applications/Source/Palette Designer/Properties/Resources.resx b/Applications/Source/Palette Designer/Properties/Resources.resx index 90e3ac9..a6ce6b2 100644 --- a/Applications/Source/Palette Designer/Properties/Resources.resx +++ b/Applications/Source/Palette Designer/Properties/Resources.resx @@ -253,14 +253,14 @@ </xsl:template> </xsl:stylesheet> - + <?xml version="1.0"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:template match="KryptonPalette"> <xsl:comment>Created by exporting the settings of a KryptonPalette instance.</xsl:comment> <xsl:comment>For more information about Krypton visit https://github.com/Krypton-Suite/Standard-Toolkit</xsl:comment> <xsl:comment>WARNING: Modifying this file may render it invalid for importing.</xsl:comment> - <KryptonPalette Version="19"> + <KryptonPalette Version="20"> <xsl:attribute name="Generated"> <xsl:value-of select="@Generated"/> </xsl:attribute> diff --git a/Applications/Source/Palette Designer/SettingsControlPanel.cs b/Applications/Source/Palette Designer/SettingsControlPanel.cs index 86d7e2b..e63db81 100644 --- a/Applications/Source/Palette Designer/SettingsControlPanel.cs +++ b/Applications/Source/Palette Designer/SettingsControlPanel.cs @@ -1,9 +1,7 @@ #region BSD License /* - * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. - * + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. */ #endregion @@ -21,15 +19,15 @@ public SettingsControlPanel() { InitializeComponent(); - kbtnCancel.Text = KryptonLanguageManager.GeneralToolkitStrings.Cancel; + kbtnCancel.Text = KryptonManager.Strings.GeneralStrings.Cancel; kbtnCancel.DialogResult = DialogResult.Cancel; - kbtnOk.Text = KryptonLanguageManager.GeneralToolkitStrings.OK; + kbtnOk.Text = KryptonManager.Strings.GeneralStrings.OK; kbtnOk.DialogResult = DialogResult.OK; - kbtnReset.Text = KryptonLanguageManager.CustomToolkitStrings.Reset; + kbtnReset.Text = KryptonManager.Strings.CustomStrings.Reset; AcceptButton = kbtnOk; diff --git a/Applications/Source/Palette Designer/Utilities/PaletteUpgradeUtilities.cs b/Applications/Source/Palette Designer/Utilities/PaletteUpgradeUtilities.cs deleted file mode 100644 index 476e524..0000000 --- a/Applications/Source/Palette Designer/Utilities/PaletteUpgradeUtilities.cs +++ /dev/null @@ -1,87 +0,0 @@ -#region BSD License -/* - * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2023 - 2023. All rights reserved. - * - */ -#endregion - - -using System.Text; -using System.Xml; -using System.Xml.Xsl; - -namespace PaletteDesigner -{ - internal class PaletteUpgradeUtilities - { - #region Identity - - public PaletteUpgradeUtilities() - { - - } - - #endregion - - #region Implementation - - public static void PerformUpgrade(Stream inputStream) - { - try - { - using var reader = new StreamReader(inputStream); - - string end = reader.ReadToEnd(); - - reader.Close(); - - using (var streamReader = new StreamReader(Resources.v6to19)) - { - using (var xmlTextReader = XmlReader.Create(streamReader)) - { - var xslCompiledTransform = new XslCompiledTransform(); - - xslCompiledTransform.Load(xmlTextReader); - - end = TransformXml(xslCompiledTransform, end); - } - } - - using var ms = new MemoryStream(); - - using (var writer = new StreamWriter(ms, new UTF8Encoding(false, true), 1024, true)) - { - writer.WriteLine(""); - writer.Write(end); - writer.Flush(); - writer.Close(); - } - - ms.Position = 0; - } - catch (Exception e) - { - - } - } - - private static string TransformXml(XslCompiledTransform transform, string xml) - { - using var reader = new StringReader(xml); - using var writer = new StringWriter(); - using var xmlTextReader = new XmlTextReader(reader); - using var xmlTextWriter = new XmlTextWriter(writer) - { - Formatting = Formatting.Indented, - Indentation = 4 - }; - - transform.Transform(xmlTextReader, xmlTextWriter); - - return writer.ToString(); - } - - #endregion - } -} \ No newline at end of file diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool 2022 - Nuget.sln b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool 2022 - Nuget.sln new file mode 100644 index 0000000..b332fc9 --- /dev/null +++ b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool 2022 - Nuget.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33205.214 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Z_Solution Items", "Z_Solution Items", "{384299E8-CD78-4074-8BED-61D580DED90A}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + README.md = README.md + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Palette Upgrade Tool 2022", "Palette Upgrade Tool\Palette Upgrade Tool 2022.csproj", "{37DC8402-4AA9-4451-8244-7037FF94C68C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {37DC8402-4AA9-4451-8244-7037FF94C68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37DC8402-4AA9-4451-8244-7037FF94C68C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37DC8402-4AA9-4451-8244-7037FF94C68C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37DC8402-4AA9-4451-8244-7037FF94C68C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E59C937A-8492-4E5C-89AD-206459D301C1} + EndGlobalSection +EndGlobal diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Palette Upgrade Tool 2022.csproj b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Palette Upgrade Tool 2022.csproj index 917ff87..09c48cd 100644 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Palette Upgrade Tool 2022.csproj +++ b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Palette Upgrade Tool 2022.csproj @@ -3,6 +3,8 @@ net48;net481;net8.0-windows;net9.0-windows WinExe true + ..\..\..\Binaries\Krypton Palette\$(Configuration)\ + app.manifest Resources\Krypton.ico PaletteUpgradeTool Palette Upgrade Tool @@ -19,9 +21,9 @@ - + - + diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/AssemblyInfo.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/AssemblyInfo.cs index 0512aa0..1f635f1 100644 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/AssemblyInfo.cs +++ b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ * © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved. * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. * */ #endregion @@ -22,7 +22,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Palette Upgrade Tool")] -[assembly: AssemblyCopyright("Copyright © 2023")] +[assembly: AssemblyCopyright("Copyright © 2024")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -44,7 +44,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.500.606.0")] -[assembly: AssemblyFileVersion("5.500.606.0")] +[assembly: AssemblyVersion("90.24.11.317")] +[assembly: AssemblyFileVersion("90.24.11.317")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/Resources.Designer.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/Resources.Designer.cs index 1c5b1f2..9116452 100644 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/Resources.Designer.cs +++ b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/Resources.Designer.cs @@ -113,12 +113,12 @@ internal static string v2to6 { /// <xsl:comment>Created by exporting the settings of a KryptonPalette instance.</xsl:comment> /// <xsl:comment>For more information about Krypton visit https://github.com/Krypton-Suite/Standard-Toolkit</xsl:comment> /// <xsl:comment>WARNING: Modifying this file may render it invalid for importing.</xsl:comment> - /// <KryptonPalette Version="19"> + /// <KryptonPalette Version="20"> /// <xsl:attr [rest of string was truncated]";. /// - internal static string v6to19 { + internal static string v6to20 { get { - return ResourceManager.GetString("v6to19", resourceCulture); + return ResourceManager.GetString("v6to20", resourceCulture); } } } diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/Resources.resx b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/Resources.resx index 3d6bc3d..155a660 100644 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/Resources.resx +++ b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/Properties/Resources.resx @@ -163,14 +163,14 @@ </xsl:template> </xsl:stylesheet> - + <?xml version="1.0"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:template match="KryptonPalette"> <xsl:comment>Created by exporting the settings of a KryptonPalette instance.</xsl:comment> <xsl:comment>For more information about Krypton visit https://github.com/Krypton-Suite/Standard-Toolkit</xsl:comment> <xsl:comment>WARNING: Modifying this file may render it invalid for importing.</xsl:comment> - <KryptonPalette Version="19"> + <KryptonPalette Version="20"> <xsl:attribute name="Generated"> <xsl:value-of select="@Generated"/> </xsl:attribute> @@ -214,6 +214,6 @@ </xsl:copy> </xsl:template> </xsl:stylesheet> - Make sure to duplictae from / in the `KryptonCustomPaletteBase` code base + Make sure to duplicate from / in the `KryptonCustomPaletteBase` code base \ No newline at end of file diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.Designer.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.Designer.cs deleted file mode 100644 index bfe6efe..0000000 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.Designer.cs +++ /dev/null @@ -1,312 +0,0 @@ -namespace PaletteUpgradeTool -{ - partial class PaletteUpgradeTool - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel(); - this.kryptonPictureBox1 = new Krypton.Toolkit.KryptonPictureBox(); - this.kryptonWrapLabel1 = new Krypton.Toolkit.KryptonWrapLabel(); - this.kryptonPanel2 = new Krypton.Toolkit.KryptonPanel(); - this.kryptonManager1 = new Krypton.Toolkit.KryptonManager(this.components); - this.kryptonCommand1 = new Krypton.Toolkit.KryptonCommand(); - this.kryptonCommand2 = new Krypton.Toolkit.KryptonCommand(); - this.kryptonContextMenu1 = new Krypton.Toolkit.KryptonContextMenu(); - this.kcpbUpgrader = new Krypton.Toolkit.KryptonCustomPaletteBase(this.components); - this.kryptonBorderEdge1 = new Krypton.Toolkit.KryptonBorderEdge(); - this.kryptonPanel3 = new Krypton.Toolkit.KryptonPanel(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.kryptonLabel1 = new Krypton.Toolkit.KryptonLabel(); - this.ktxtInputDirectory = new Krypton.Toolkit.KryptonTextBox(); - this.kryptonLabel2 = new Krypton.Toolkit.KryptonLabel(); - this.ktxtOutputDirectory = new Krypton.Toolkit.KryptonTextBox(); - this.klbFiles = new Krypton.Toolkit.KryptonListBox(); - this.kbtnOptions = new Krypton.Toolkit.KryptonButton(); - this.kbtnCancel = new Krypton.Toolkit.KryptonButton(); - this.kbtnUpgrade = new Krypton.Toolkit.KryptonButton(); - this.bsaBrowseInputDirectory = new Krypton.Toolkit.ButtonSpecAny(); - this.bsaBrowseOutputDirectory = new Krypton.Toolkit.ButtonSpecAny(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit(); - this.kryptonPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel2)).BeginInit(); - this.kryptonPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel3)).BeginInit(); - this.kryptonPanel3.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // kryptonPanel1 - // - this.kryptonPanel1.Controls.Add(this.kryptonWrapLabel1); - this.kryptonPanel1.Controls.Add(this.kryptonPictureBox1); - this.kryptonPanel1.Dock = System.Windows.Forms.DockStyle.Top; - this.kryptonPanel1.Location = new System.Drawing.Point(0, 0); - this.kryptonPanel1.Name = "kryptonPanel1"; - this.kryptonPanel1.PanelBackStyle = Krypton.Toolkit.PaletteBackStyle.ControlCustom1; - this.kryptonPanel1.Size = new System.Drawing.Size(800, 113); - this.kryptonPanel1.TabIndex = 0; - // - // kryptonPictureBox1 - // - this.kryptonPictureBox1.Dock = System.Windows.Forms.DockStyle.Right; - this.kryptonPictureBox1.Image = global::PaletteUpgradeTool.Properties.Resources.Krypton_Icon_64_x_64; - this.kryptonPictureBox1.Location = new System.Drawing.Point(700, 0); - this.kryptonPictureBox1.Name = "kryptonPictureBox1"; - this.kryptonPictureBox1.Size = new System.Drawing.Size(100, 113); - this.kryptonPictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.kryptonPictureBox1.TabIndex = 0; - this.kryptonPictureBox1.TabStop = false; - // - // kryptonWrapLabel1 - // - this.kryptonWrapLabel1.AutoSize = false; - this.kryptonWrapLabel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonWrapLabel1.Font = new System.Drawing.Font("Segoe UI", 13.5F, System.Drawing.FontStyle.Bold); - this.kryptonWrapLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(57)))), ((int)(((byte)(91))))); - this.kryptonWrapLabel1.LabelStyle = Krypton.Toolkit.LabelStyle.TitleControl; - this.kryptonWrapLabel1.Location = new System.Drawing.Point(0, 0); - this.kryptonWrapLabel1.Name = "kryptonWrapLabel1"; - this.kryptonWrapLabel1.Padding = new System.Windows.Forms.Padding(5); - this.kryptonWrapLabel1.Size = new System.Drawing.Size(700, 113); - this.kryptonWrapLabel1.Text = "Palette Upgrade Tool (Beta) β"; - this.kryptonWrapLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.kryptonWrapLabel1.UseCompatibleTextRendering = true; - // - // kryptonPanel2 - // - this.kryptonPanel2.Controls.Add(this.kbtnUpgrade); - this.kryptonPanel2.Controls.Add(this.kbtnCancel); - this.kryptonPanel2.Controls.Add(this.kbtnOptions); - this.kryptonPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.kryptonPanel2.Location = new System.Drawing.Point(0, 610); - this.kryptonPanel2.Name = "kryptonPanel2"; - this.kryptonPanel2.PanelBackStyle = Krypton.Toolkit.PaletteBackStyle.PanelAlternate; - this.kryptonPanel2.Size = new System.Drawing.Size(800, 50); - this.kryptonPanel2.TabIndex = 1; - // - // kryptonCommand1 - // - this.kryptonCommand1.Text = "kryptonCommand1"; - // - // kryptonCommand2 - // - this.kryptonCommand2.Text = "kryptonCommand2"; - // - // kcpbUpgrader - // - this.kcpbUpgrader.BasePaletteType = Krypton.Toolkit.BasePaletteType.Custom; - this.kcpbUpgrader.ThemeName = null; - this.kcpbUpgrader.UseThemeFormChromeBorderWidth = Krypton.Toolkit.InheritBool.True; - // - // kryptonBorderEdge1 - // - this.kryptonBorderEdge1.BorderStyle = Krypton.Toolkit.PaletteBorderStyle.HeaderPrimary; - this.kryptonBorderEdge1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.kryptonBorderEdge1.Location = new System.Drawing.Point(0, 609); - this.kryptonBorderEdge1.Name = "kryptonBorderEdge1"; - this.kryptonBorderEdge1.Size = new System.Drawing.Size(800, 1); - this.kryptonBorderEdge1.Text = "kryptonBorderEdge1"; - // - // kryptonPanel3 - // - this.kryptonPanel3.Controls.Add(this.tableLayoutPanel1); - this.kryptonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonPanel3.Location = new System.Drawing.Point(0, 113); - this.kryptonPanel3.Name = "kryptonPanel3"; - this.kryptonPanel3.Size = new System.Drawing.Size(800, 496); - this.kryptonPanel3.TabIndex = 3; - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.BackColor = System.Drawing.Color.Transparent; - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.kryptonLabel1, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.ktxtInputDirectory, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.kryptonLabel2, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.ktxtOutputDirectory, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.klbFiles, 0, 2); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 5; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(800, 496); - this.tableLayoutPanel1.TabIndex = 0; - // - // kryptonLabel1 - // - this.kryptonLabel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonLabel1.LabelStyle = Krypton.Toolkit.LabelStyle.BoldPanel; - this.kryptonLabel1.Location = new System.Drawing.Point(3, 3); - this.kryptonLabel1.Name = "kryptonLabel1"; - this.kryptonLabel1.Size = new System.Drawing.Size(794, 20); - this.kryptonLabel1.TabIndex = 0; - this.kryptonLabel1.Values.Text = "Input Directory:"; - // - // ktxtInputDirectory - // - this.ktxtInputDirectory.ButtonSpecs.Add(this.bsaBrowseInputDirectory); - this.ktxtInputDirectory.Dock = System.Windows.Forms.DockStyle.Fill; - this.ktxtInputDirectory.Location = new System.Drawing.Point(3, 29); - this.ktxtInputDirectory.Name = "ktxtInputDirectory"; - this.ktxtInputDirectory.Size = new System.Drawing.Size(794, 24); - this.ktxtInputDirectory.TabIndex = 1; - this.ktxtInputDirectory.Text = "kryptonTextBox1"; - // - // kryptonLabel2 - // - this.kryptonLabel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonLabel2.LabelStyle = Krypton.Toolkit.LabelStyle.BoldPanel; - this.kryptonLabel2.Location = new System.Drawing.Point(3, 444); - this.kryptonLabel2.Name = "kryptonLabel2"; - this.kryptonLabel2.Size = new System.Drawing.Size(794, 20); - this.kryptonLabel2.TabIndex = 2; - this.kryptonLabel2.Values.Text = "Output Directory:"; - // - // ktxtOutputDirectory - // - this.ktxtOutputDirectory.ButtonSpecs.Add(this.bsaBrowseOutputDirectory); - this.ktxtOutputDirectory.Dock = System.Windows.Forms.DockStyle.Fill; - this.ktxtOutputDirectory.Location = new System.Drawing.Point(3, 470); - this.ktxtOutputDirectory.Name = "ktxtOutputDirectory"; - this.ktxtOutputDirectory.Size = new System.Drawing.Size(794, 24); - this.ktxtOutputDirectory.TabIndex = 3; - this.ktxtOutputDirectory.Text = "kryptonTextBox2"; - // - // klbFiles - // - this.klbFiles.Dock = System.Windows.Forms.DockStyle.Fill; - this.klbFiles.Location = new System.Drawing.Point(3, 58); - this.klbFiles.Name = "klbFiles"; - this.klbFiles.Size = new System.Drawing.Size(794, 380); - this.klbFiles.TabIndex = 4; - // - // kbtnOptions - // - this.kbtnOptions.Location = new System.Drawing.Point(12, 13); - this.kbtnOptions.Name = "kbtnOptions"; - this.kbtnOptions.Size = new System.Drawing.Size(90, 25); - this.kbtnOptions.TabIndex = 0; - this.kbtnOptions.Values.DropDownArrowColor = System.Drawing.Color.Empty; - this.kbtnOptions.Values.Text = "O&ptions"; - this.kbtnOptions.Click += new System.EventHandler(this.kbtnOptions_Click); - // - // kbtnCancel - // - this.kbtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.kbtnCancel.Location = new System.Drawing.Point(698, 13); - this.kbtnCancel.Name = "kbtnCancel"; - this.kbtnCancel.Size = new System.Drawing.Size(90, 25); - this.kbtnCancel.TabIndex = 1; - this.kbtnCancel.Values.DropDownArrowColor = System.Drawing.Color.Empty; - this.kbtnCancel.Values.Text = "Cance&l"; - this.kbtnCancel.Values.UseAsADialogButton = true; - this.kbtnCancel.Click += new System.EventHandler(this.kbtnCancel_Click); - // - // kbtnUpgrade - // - this.kbtnUpgrade.Enabled = false; - this.kbtnUpgrade.Location = new System.Drawing.Point(602, 13); - this.kbtnUpgrade.Name = "kbtnUpgrade"; - this.kbtnUpgrade.Size = new System.Drawing.Size(90, 25); - this.kbtnUpgrade.TabIndex = 2; - this.kbtnUpgrade.Values.DropDownArrowColor = System.Drawing.Color.Empty; - this.kbtnUpgrade.Values.Text = "&Upgrade"; - this.kbtnUpgrade.Click += new System.EventHandler(this.kbtnUpgrade_Click); - // - // bsaBrowseInputDirectory - // - this.bsaBrowseInputDirectory.Text = ".&.."; - this.bsaBrowseInputDirectory.UniqueName = "c205ee999e4247bcbfe0a548e67162bb"; - this.bsaBrowseInputDirectory.Click += new System.EventHandler(this.bsaBrowseInputDirectory_Click); - // - // bsaBrowseOutputDirectory - // - this.bsaBrowseOutputDirectory.Text = ".&.."; - this.bsaBrowseOutputDirectory.UniqueName = "1c9813f6c04040889c4bd1bdc08cd88c"; - this.bsaBrowseOutputDirectory.Click += new System.EventHandler(this.bsaBrowseOutputDirectory_Click); - // - // PaletteUpgradeTool - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 660); - this.Controls.Add(this.kryptonPanel3); - this.Controls.Add(this.kryptonBorderEdge1); - this.Controls.Add(this.kryptonPanel2); - this.Controls.Add(this.kryptonPanel1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; - this.MinimizeBox = false; - this.Name = "PaletteUpgradeTool"; - this.Text = "Palette Upgrade Tool (Beta) β"; - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).EndInit(); - this.kryptonPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel2)).EndInit(); - this.kryptonPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel3)).EndInit(); - this.kryptonPanel3.ResumeLayout(false); - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private Krypton.Toolkit.KryptonPanel kryptonPanel1; - private Krypton.Toolkit.KryptonPictureBox kryptonPictureBox1; - private Krypton.Toolkit.KryptonWrapLabel kryptonWrapLabel1; - private Krypton.Toolkit.KryptonPanel kryptonPanel2; - private Krypton.Toolkit.KryptonManager kryptonManager1; - private Krypton.Toolkit.KryptonCommand kryptonCommand1; - private Krypton.Toolkit.KryptonCommand kryptonCommand2; - private Krypton.Toolkit.KryptonContextMenu kryptonContextMenu1; - private Krypton.Toolkit.KryptonCustomPaletteBase kcpbUpgrader; - private Krypton.Toolkit.KryptonBorderEdge kryptonBorderEdge1; - private Krypton.Toolkit.KryptonPanel kryptonPanel3; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private Krypton.Toolkit.KryptonLabel kryptonLabel1; - private Krypton.Toolkit.KryptonTextBox ktxtInputDirectory; - private Krypton.Toolkit.KryptonLabel kryptonLabel2; - private Krypton.Toolkit.KryptonTextBox ktxtOutputDirectory; - private Krypton.Toolkit.KryptonListBox klbFiles; - private Krypton.Toolkit.KryptonButton kbtnOptions; - private Krypton.Toolkit.KryptonButton kbtnCancel; - private Krypton.Toolkit.KryptonButton kbtnUpgrade; - private Krypton.Toolkit.ButtonSpecAny bsaBrowseInputDirectory; - private Krypton.Toolkit.ButtonSpecAny bsaBrowseOutputDirectory; - } -} \ No newline at end of file diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.cs deleted file mode 100644 index a59c963..0000000 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.cs +++ /dev/null @@ -1,149 +0,0 @@ -#region BSD License -/* - * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2024 - 2024. All rights reserved. - */ -#endregion - -namespace PaletteUpgradeTool -{ - public partial class PaletteUpgradeTool : KryptonForm - { - public PaletteUpgradeTool() - { - InitializeComponent(); - - Icon = Resources.Krypton; - } - - private void kbtnOptions_Click(object sender, EventArgs e) - { - var options = new PaletteUpgradeToolOptions(); - - options.ShowDialog(); - } - - private void bsaBrowseInputDirectory_Click(object sender, EventArgs e) - { - if (kryptonManager1.UseKryptonFileDialogs) - { - KryptonFolderBrowserDialog dialog = new KryptonFolderBrowserDialog(); - - if (dialog.ShowDialog() == DialogResult.OK) - { - ktxtInputDirectory.Text = $@"{Path.GetFullPath(dialog.SelectedPath)}\"; - } - } - else - { - FolderBrowserDialog dialog = new FolderBrowserDialog(); - - dialog.ShowNewFolderButton = true; - - if (dialog.ShowDialog() == DialogResult.OK) - { - ktxtInputDirectory.Text = $@"{Path.GetFullPath(dialog.SelectedPath)}\"; - } - } - - FillListBox(); - } - - private void bsaBrowseOutputDirectory_Click(object sender, EventArgs e) - { - if (kryptonManager1.UseKryptonFileDialogs) - { - KryptonFolderBrowserDialog dialog = new KryptonFolderBrowserDialog(); - - if (dialog.ShowDialog() == DialogResult.OK) - { - ktxtOutputDirectory.Text = $"{Path.GetFullPath(dialog.SelectedPath)}\\Palette Version {GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION}\\"; - } - } - else - { - FolderBrowserDialog dialog = new FolderBrowserDialog(); - - dialog.ShowNewFolderButton = true; - - if (dialog.ShowDialog() == DialogResult.OK) - { - ktxtOutputDirectory.Text = $@"{Path.GetFullPath(dialog.SelectedPath)}\Palette Version {GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION}\"; - } - } - - kbtnUpgrade.Enabled = true; - } - - private void kbtnCancel_Click(object sender, EventArgs e) - { - Close(); - } - - private void kbtnUpgrade_Click(object sender, EventArgs e) - { - //try - //{ - UpgradePalettes(ktxtInputDirectory.Text, ktxtOutputDirectory.Text); - //} - //catch (Exception exception) - //{ - // KryptonMessageBox.Show($"{exception}"); - //} - } - - private void ValidateOutputPath(string path) - { - if (!Directory.Exists(path)) - { - Directory.CreateDirectory(path); - } - } - - private string[] GetPaletteFiles(string path) => Directory.GetFiles(path); - - private void ktxtInputDirectory_TextChanged(object sender, EventArgs e) - { - FillListBox(); - } - - private void FillListBox() - { - // Clear list box first - if (klbFiles.Items.Count > 0) - { - klbFiles.Items.Clear(); - } - - if (ktxtInputDirectory.Text.EndsWith("\\")) - { - // Fill listbox - foreach (var paletteFile in GetPaletteFiles(ktxtInputDirectory.Text)) - { - klbFiles.Items.Add(Path.GetFullPath(paletteFile)); - } - } - } - - private void UpgradePalettes(string inputPath, string outputPath) - { - // Validate output path to check if it exists - ValidateOutputPath(outputPath); - - // Loop through the file array - foreach (var paletteFile in GetPaletteFiles(inputPath)) - { - // Set a temporary file name - string tempFileName = Path.GetFileName(paletteFile); - - // Upgrade the file and store it into the newly created directory - kcpbUpgrader.ImportWithUpgrade(File.OpenRead(Path.GetFullPath(paletteFile))); - - // Export the file - kcpbUpgrader.Export(File.OpenWrite($"{outputPath}\\{tempFileName}"), false); - - tempFileName = string.Empty; - } - } - } -} diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.resx b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.resx deleted file mode 100644 index afd6e0c..0000000 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeTool.resx +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 165, 17 - - - 323, 17 - - - 481, 17 - - - 655, 17 - - \ No newline at end of file diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.Designer.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.Designer.cs index e19e8d4..04a09be 100644 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.Designer.cs +++ b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.Designer.cs @@ -28,7 +28,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PaletteUpgradeToolOld)); this.kpnlBackground = new Krypton.Toolkit.KryptonPanel(); this.klblStatus = new Krypton.Toolkit.KryptonLabel(); @@ -40,13 +39,8 @@ private void InitializeComponent() this.krtbInput = new Krypton.Toolkit.KryptonRichTextBox(); this.kryptonLabel2 = new Krypton.Toolkit.KryptonLabel(); this.kryptonLabel1 = new Krypton.Toolkit.KryptonLabel(); - this.tmrDetectModification = new System.Windows.Forms.Timer(this.components); this.kpnlTop = new Krypton.Toolkit.KryptonPanel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.kMan = new Krypton.Toolkit.KryptonManager(this.components); - this.colorDialog1 = new System.Windows.Forms.ColorDialog(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.kbtnUseNewUI = new Krypton.Toolkit.KryptonButton(); ((System.ComponentModel.ISupportInitialize)(this.kpnlBackground)).BeginInit(); this.kpnlBackground.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.kpnlTop)).BeginInit(); @@ -56,7 +50,6 @@ private void InitializeComponent() // // kpnlBackground // - this.kpnlBackground.Controls.Add(this.kbtnUseNewUI); this.kpnlBackground.Controls.Add(this.klblStatus); this.kpnlBackground.Controls.Add(this.kbtnClose); this.kpnlBackground.Controls.Add(this.kbtnUpgrade); @@ -66,16 +59,18 @@ private void InitializeComponent() this.kpnlBackground.Controls.Add(this.krtbInput); this.kpnlBackground.Controls.Add(this.kryptonLabel2); this.kpnlBackground.Dock = System.Windows.Forms.DockStyle.Fill; - this.kpnlBackground.Location = new System.Drawing.Point(0, 113); + this.kpnlBackground.Location = new System.Drawing.Point(0, 139); + this.kpnlBackground.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kpnlBackground.Name = "kpnlBackground"; - this.kpnlBackground.Size = new System.Drawing.Size(800, 335); + this.kpnlBackground.Size = new System.Drawing.Size(1067, 412); this.kpnlBackground.TabIndex = 0; // // klblStatus // - this.klblStatus.Location = new System.Drawing.Point(12, 292); + this.klblStatus.Location = new System.Drawing.Point(16, 359); + this.klblStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.klblStatus.Name = "klblStatus"; - this.klblStatus.Size = new System.Drawing.Size(330, 30); + this.klblStatus.Size = new System.Drawing.Size(410, 37); this.klblStatus.StateCommon.ShortText.Color1 = System.Drawing.Color.Red; this.klblStatus.StateCommon.ShortText.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.klblStatus.TabIndex = 11; @@ -83,9 +78,10 @@ private void InitializeComponent() // // kbtnClose // - this.kbtnClose.Location = new System.Drawing.Point(698, 297); + this.kbtnClose.Location = new System.Drawing.Point(931, 366); + this.kbtnClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnClose.Name = "kbtnClose"; - this.kbtnClose.Size = new System.Drawing.Size(90, 25); + this.kbtnClose.Size = new System.Drawing.Size(120, 31); this.kbtnClose.StateCommon.Content.ShortText.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.kbtnClose.TabIndex = 10; this.kbtnClose.Values.DropDownArrowColor = System.Drawing.Color.Empty; @@ -95,9 +91,10 @@ private void InitializeComponent() // kbtnUpgrade // this.kbtnUpgrade.Enabled = false; - this.kbtnUpgrade.Location = new System.Drawing.Point(698, 191); + this.kbtnUpgrade.Location = new System.Drawing.Point(931, 235); + this.kbtnUpgrade.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnUpgrade.Name = "kbtnUpgrade"; - this.kbtnUpgrade.Size = new System.Drawing.Size(90, 25); + this.kbtnUpgrade.Size = new System.Drawing.Size(120, 31); this.kbtnUpgrade.StateCommon.Content.ShortText.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.kbtnUpgrade.TabIndex = 7; this.kbtnUpgrade.Values.DropDownArrowColor = System.Drawing.Color.Empty; @@ -106,9 +103,10 @@ private void InitializeComponent() // // krtbOutput // - this.krtbOutput.Location = new System.Drawing.Point(12, 182); + this.krtbOutput.Location = new System.Drawing.Point(16, 224); + this.krtbOutput.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.krtbOutput.Name = "krtbOutput"; - this.krtbOutput.Size = new System.Drawing.Size(679, 96); + this.krtbOutput.Size = new System.Drawing.Size(905, 118); this.krtbOutput.StateCommon.Content.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.krtbOutput.TabIndex = 6; this.krtbOutput.Text = ""; @@ -116,18 +114,20 @@ private void InitializeComponent() // // kryptonLabel3 // - this.kryptonLabel3.Location = new System.Drawing.Point(12, 150); + this.kryptonLabel3.Location = new System.Drawing.Point(16, 185); + this.kryptonLabel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLabel3.Name = "kryptonLabel3"; - this.kryptonLabel3.Size = new System.Drawing.Size(158, 26); + this.kryptonLabel3.Size = new System.Drawing.Size(195, 32); this.kryptonLabel3.StateCommon.ShortText.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.kryptonLabel3.TabIndex = 5; this.kryptonLabel3.Values.Text = "Output Palette File"; // // kbtnBrowse // - this.kbtnBrowse.Location = new System.Drawing.Point(698, 84); + this.kbtnBrowse.Location = new System.Drawing.Point(931, 103); + this.kbtnBrowse.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kbtnBrowse.Name = "kbtnBrowse"; - this.kbtnBrowse.Size = new System.Drawing.Size(90, 25); + this.kbtnBrowse.Size = new System.Drawing.Size(120, 31); this.kbtnBrowse.StateCommon.Content.ShortText.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.kbtnBrowse.TabIndex = 4; this.kbtnBrowse.Values.DropDownArrowColor = System.Drawing.Color.Empty; @@ -136,46 +136,45 @@ private void InitializeComponent() // // krtbInput // - this.krtbInput.Location = new System.Drawing.Point(12, 48); + this.krtbInput.Location = new System.Drawing.Point(16, 59); + this.krtbInput.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.krtbInput.Name = "krtbInput"; this.krtbInput.ReadOnly = true; - this.krtbInput.Size = new System.Drawing.Size(679, 96); + this.krtbInput.Size = new System.Drawing.Size(905, 118); this.krtbInput.StateCommon.Content.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.krtbInput.TabIndex = 3; this.krtbInput.Text = ""; // // kryptonLabel2 // - this.kryptonLabel2.Location = new System.Drawing.Point(12, 16); + this.kryptonLabel2.Location = new System.Drawing.Point(16, 20); + this.kryptonLabel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLabel2.Name = "kryptonLabel2"; - this.kryptonLabel2.Size = new System.Drawing.Size(144, 26); + this.kryptonLabel2.Size = new System.Drawing.Size(178, 32); this.kryptonLabel2.StateCommon.ShortText.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.kryptonLabel2.TabIndex = 2; this.kryptonLabel2.Values.Text = "Input Palette File"; // // kryptonLabel1 // - this.kryptonLabel1.Location = new System.Drawing.Point(12, 66); + this.kryptonLabel1.Location = new System.Drawing.Point(16, 81); + this.kryptonLabel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kryptonLabel1.Name = "kryptonLabel1"; - this.kryptonLabel1.Size = new System.Drawing.Size(209, 30); + this.kryptonLabel1.Size = new System.Drawing.Size(259, 37); this.kryptonLabel1.StateCommon.ShortText.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.kryptonLabel1.TabIndex = 1; this.kryptonLabel1.Values.Text = "Palette Upgrade Tool"; // - // tmrDetectModification - // - this.tmrDetectModification.Enabled = true; - this.tmrDetectModification.Interval = 250; - // // kpnlTop // this.kpnlTop.Controls.Add(this.pictureBox1); this.kpnlTop.Controls.Add(this.kryptonLabel1); this.kpnlTop.Dock = System.Windows.Forms.DockStyle.Top; this.kpnlTop.Location = new System.Drawing.Point(0, 0); + this.kpnlTop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.kpnlTop.Name = "kpnlTop"; this.kpnlTop.PanelBackStyle = Krypton.Toolkit.PaletteBackStyle.ControlCustom1; - this.kpnlTop.Size = new System.Drawing.Size(800, 113); + this.kpnlTop.Size = new System.Drawing.Size(1067, 139); this.kpnlTop.TabIndex = 1; // // pictureBox1 @@ -183,34 +182,25 @@ private void InitializeComponent() this.pictureBox1.BackColor = System.Drawing.Color.Transparent; this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Right; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(690, 0); + this.pictureBox1.Location = new System.Drawing.Point(920, 0); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(110, 113); + this.pictureBox1.Size = new System.Drawing.Size(147, 139); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.pictureBox1.TabIndex = 2; this.pictureBox1.TabStop = false; // - // kbtnUseNewUI - // - this.kbtnUseNewUI.Location = new System.Drawing.Point(602, 297); - this.kbtnUseNewUI.Name = "kbtnUseNewUI"; - this.kbtnUseNewUI.Size = new System.Drawing.Size(90, 25); - this.kbtnUseNewUI.StateCommon.Content.ShortText.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.kbtnUseNewUI.TabIndex = 12; - this.kbtnUseNewUI.Values.DropDownArrowColor = System.Drawing.Color.Empty; - this.kbtnUseNewUI.Values.Text = "&Use Beta"; - this.kbtnUseNewUI.Click += new System.EventHandler(this.kbtnUseNewUI_Click); - // // PaletteUpgradeToolOld // this.AcceptButton = this.kbtnClose; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 448); + this.ClientSize = new System.Drawing.Size(1067, 551); this.Controls.Add(this.kpnlBackground); this.Controls.Add(this.kpnlTop); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "PaletteUpgradeToolOld"; @@ -238,13 +228,8 @@ private void InitializeComponent() private Krypton.Toolkit.KryptonLabel kryptonLabel2; private Krypton.Toolkit.KryptonLabel kryptonLabel1; private Krypton.Toolkit.KryptonButton kbtnClose; - private System.Windows.Forms.Timer tmrDetectModification; private Krypton.Toolkit.KryptonLabel klblStatus; private Krypton.Toolkit.KryptonPanel kpnlTop; private System.Windows.Forms.PictureBox pictureBox1; - private Krypton.Toolkit.KryptonManager kMan; - private System.Windows.Forms.ColorDialog colorDialog1; - private System.Windows.Forms.Timer timer1; - private Krypton.Toolkit.KryptonButton kbtnUseNewUI; } } \ No newline at end of file diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.cs index 7201956..0208699 100644 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.cs +++ b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.cs @@ -5,7 +5,7 @@ * © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved. * * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2023. All rights reserved. + * Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. * */ #endregion @@ -20,18 +20,13 @@ namespace PaletteUpgradeTool.UI public partial class PaletteUpgradeToolOld : KryptonForm { #region Variables - private const int MINIMUM_VERSION_NUMBER = 2, MAXIMUM_VERSION_NUMBER = 18; + private const int MINIMUM_VERSION_NUMBER = 2, MAXIMUM_VERSION_NUMBER = GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION; #endregion - #region Properties - /// - /// Gets or sets the input version number. - /// - /// - /// The input version number. - /// - public int InputVersionNumber { get; set; } + #region Properties + + private int _inputVersionNumber; #endregion @@ -69,9 +64,9 @@ private void kbtnUpgrade_Click(object sender, EventArgs e) { try { - StreamReader reader = new StreamReader(krtbInput.Text); + var reader = new StreamReader(krtbInput.Text); - string end = reader.ReadToEnd(); + var end = reader.ReadToEnd(); reader.Close(); @@ -82,9 +77,9 @@ private void kbtnUpgrade_Click(object sender, EventArgs e) xslCompiledTransform.Load(new XmlTextReader(new StringReader(Resources.v2to6))); end = TransformXml(xslCompiledTransform, end); } - else if (GetInputVersionNumber() <= MAXIMUM_VERSION_NUMBER) + else if (GetInputVersionNumber() < MAXIMUM_VERSION_NUMBER) { - var streamReader = new StringReader(Resources.v6to19); + var streamReader = new StringReader(Resources.v6to20); var xmlTextReader = XmlReader.Create(streamReader); var xslCompiledTransform1 = new XslCompiledTransform(); xslCompiledTransform1.Load(xmlTextReader); @@ -101,7 +96,7 @@ private void kbtnUpgrade_Click(object sender, EventArgs e) writer.Close(); - object[] text = new object[] { "Input file: ", krtbInput.Text, "\nOutput file: ", krtbOutput.Text, "\n\nUpgrade from version '", InputVersionNumber, "' to version '", 19.ToString(), "' has succeeded." }; + var text = new object[] { "Input file: ", krtbInput.Text, "\nOutput file: ", krtbOutput.Text, "\n\nUpgrade from version '", _inputVersionNumber, "' to version '", MAXIMUM_VERSION_NUMBER.ToString(), "' has succeeded." }; KryptonMessageBox.Show(this, string.Concat(text), "Upgrade Success", KryptonMessageBoxButtons.OK, KryptonMessageBoxIcon.Information); @@ -128,7 +123,7 @@ private void kbtnBrowse_Click(object sender, EventArgs e) if (openFileDialog.ShowDialog() == DialogResult.OK) { - int paletteFileNumber = GetPaletteFileNumber(openFileDialog.FileName); + var paletteFileNumber = GetPaletteFileNumber(openFileDialog.FileName); switch (paletteFileNumber) { @@ -141,7 +136,7 @@ private void kbtnBrowse_Click(object sender, EventArgs e) break; case < MINIMUM_VERSION_NUMBER: { - string[] fileName = new string[] { "File '", openFileDialog.FileName, "' contains palette format version '", paletteFileNumber.ToString(), "'.\nPalette upgrade tool can only upgrade version '", MINIMUM_VERSION_NUMBER.ToString(), "' and upwards." }; + var fileName = new string[] { "File '", openFileDialog.FileName, "' contains palette format version '", paletteFileNumber.ToString(), "'.\nPalette upgrade tool can only upgrade version '", MINIMUM_VERSION_NUMBER.ToString(), "' and upwards." }; KryptonMessageBox.Show(this, string.Concat(fileName), @@ -150,17 +145,19 @@ private void kbtnBrowse_Click(object sender, EventArgs e) KryptonMessageBoxIcon.Warning); break; } - case <= MAXIMUM_VERSION_NUMBER: + case < MAXIMUM_VERSION_NUMBER: { krtbInput.Text = openFileDialog.FileName; SetInputVersionNumber(paletteFileNumber); - FileInfo fileInfo = new FileInfo(openFileDialog.FileName); + var fileInfo = new FileInfo(openFileDialog.FileName); - string str = (fileInfo.Name.IndexOf(fileInfo.Extension) <= 0 ? fileInfo.Name : fileInfo.Name.Substring(0, fileInfo.Name.IndexOf(fileInfo.Extension))); + var str = (fileInfo.Name.IndexOf(fileInfo.Extension) <= 0 + ? fileInfo.Name + : fileInfo.Name.Substring(0, fileInfo.Name.IndexOf(fileInfo.Extension))); - string directoryName = fileInfo.DirectoryName; + var directoryName = fileInfo.DirectoryName; if (!directoryName.EndsWith("\\")) { @@ -169,14 +166,14 @@ private void kbtnBrowse_Click(object sender, EventArgs e) KryptonRichTextBox richTextBox = krtbOutput; - string[] strArrays = new string[] { directoryName, str, "_v", (MAXIMUM_VERSION_NUMBER + 1).ToString(), fileInfo.Extension }; + var strArrays = new string[] { directoryName, str, "_v", MAXIMUM_VERSION_NUMBER.ToString(), fileInfo.Extension }; richTextBox.Text = string.Concat(strArrays); break; } default: { - string[] fileName1 = new string[] { "File '", openFileDialog.FileName, "' contains palette format version '", paletteFileNumber.ToString(), "'.\nPalette upgrade tool can only upgrade version '", 17.ToString(), "' and below." }; + var fileName1 = new string[] { "File '", openFileDialog.FileName, "' contains palette format version '", paletteFileNumber.ToString(), "'.\nPalette upgrade tool can only upgrade version '", (MAXIMUM_VERSION_NUMBER-1).ToString(), "' and below." }; KryptonMessageBox.Show(this, string.Concat(fileName1), @@ -209,7 +206,7 @@ private void krtbOutput_TextChanged(object sender, EventArgs e) /// The desired value of InputVersionNumber. private void SetInputVersionNumber(int value) { - InputVersionNumber = value; + _inputVersionNumber = value; } /// @@ -218,7 +215,7 @@ private void SetInputVersionNumber(int value) /// The value of the InputVersionNumber. private int GetInputVersionNumber() { - return InputVersionNumber; + return _inputVersionNumber; } #endregion @@ -236,7 +233,7 @@ private int GetPaletteFileNumber(string fileName) if (xPathNavigator != null) { - string attribute = xPathNavigator.GetAttribute("Version", string.Empty); + var attribute = xPathNavigator.GetAttribute("Version", string.Empty); if (!string.IsNullOrEmpty(attribute)) { @@ -264,13 +261,13 @@ private int GetPaletteFileNumber(string fileName) /// private string TransformXml(XslCompiledTransform transform, string xml) { - StringReader reader = new StringReader(xml); + var reader = new StringReader(xml); - StringWriter writer = new StringWriter(); + var writer = new StringWriter(); - XmlTextReader xmlTextReader = new XmlTextReader(reader); + var xmlTextReader = new XmlTextReader(reader); - XmlTextWriter xmlTextWriter = new XmlTextWriter(writer) + var xmlTextWriter = new XmlTextWriter(writer) { Formatting = Formatting.Indented, Indentation = 4 @@ -286,10 +283,10 @@ private string TransformXml(XslCompiledTransform transform, string xml) /// private void UpdateState() { - bool length = krtbInput.Text.Length > 0; - bool flag0 = ValidOutputDirectory(krtbOutput.Text); - bool flag1 = ValidOutputFilename(krtbOutput.Text); - bool flag2 = (GetInputVersionNumber() >= MINIMUM_VERSION_NUMBER && GetInputVersionNumber() <= MAXIMUM_VERSION_NUMBER); + var length = krtbInput.Text.Length > 0; + var flag0 = ValidOutputDirectory(krtbOutput.Text); + var flag1 = ValidOutputFilename(krtbOutput.Text); + var flag2 = (GetInputVersionNumber() >= MINIMUM_VERSION_NUMBER && GetInputVersionNumber() < MAXIMUM_VERSION_NUMBER); kbtnUpgrade.Enabled = (length && flag0 && flag1 && flag2); @@ -297,9 +294,7 @@ private void UpdateState() { klblStatus.ForeColor = Color.Green; - int num = MAXIMUM_VERSION_NUMBER + 1; - - klblStatus.Text = $"Convert to output version ' {num}'."; + klblStatus.Text = $"Convert to output version ' {MAXIMUM_VERSION_NUMBER}'."; return; } @@ -347,13 +342,6 @@ private bool ValidOutputDirectory(string filename) } } - private void kbtnUseNewUI_Click(object sender, EventArgs e) - { - var putNew = new PaletteUpgradeTool(); - - putNew.Show(); - } - /// /// Validates the output filename. /// diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.resx b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.resx index 193ce75..957adfc 100644 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.resx +++ b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOld.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 99, 17 - @@ -168,7 +165,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAABx9JREFUeF7tm+lWE0kU + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAABx9JREFUeF7tm+lWE0kU x30AH8U3mPngS8w58wQz58ycMzpfFBfcFcWVTUAWFZWwDIvI4g4CKiqC4AoKWcgCSQhLAiGAc6f+BR27 qysb0H0GCOf8ThL63uquf1dX1b1VvQN/RLSLsXs7MU7enbzyEYrsGl78utQZ6qbtQxcVD5ZYuABj5Nrd EmyjxkATtQbaqMHXsGWpZ9T4a8nir6bDdzPbNQLUTzbS/pF9W54DIxmUN1CgF8Diq+IG72ae0NfQCxqY @@ -202,15 +199,6 @@ f+UCbO+/HTv+AweyjoO9EY+tAAAAAElFTkSuQmCC - - 17, 17 - - - 310, 17 - - - 454, 17 - AAABAAUAMDAAAAEAIACoJQAAVgAAACAgAAABACAAqBAAAP4lAAAgIAAAAQAIAKgIAACmNgAAEBAAAAEA diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOptions.Designer.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOptions.Designer.cs deleted file mode 100644 index a1d9d40..0000000 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOptions.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace PaletteUpgradeTool -{ - partial class PaletteUpgradeToolOptions - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "PaletteUpgradeToolOptions"; - } - - #endregion - } -} \ No newline at end of file diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOptions.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOptions.cs deleted file mode 100644 index c7fd152..0000000 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolOptions.cs +++ /dev/null @@ -1,17 +0,0 @@ -#region BSD License -/* - * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2024 - 2024. All rights reserved. - */ -#endregion - -namespace PaletteUpgradeTool -{ - public partial class PaletteUpgradeToolOptions : KryptonForm - { - public PaletteUpgradeToolOptions() - { - InitializeComponent(); - } - } -} diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.Designer.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.Designer.cs deleted file mode 100644 index bfdd903..0000000 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.Designer.cs +++ /dev/null @@ -1,324 +0,0 @@ -namespace PaletteUpgradeTool -{ - partial class PaletteUpgradeToolTest - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.kpnlTop = new Krypton.Toolkit.KryptonPanel(); - this.kryptonWrapLabel1 = new Krypton.Toolkit.KryptonWrapLabel(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel(); - this.kbtnOptions = new Krypton.Toolkit.KryptonButton(); - this.kbtnUpgrade = new Krypton.Toolkit.KryptonButton(); - this.kbtnCancel = new Krypton.Toolkit.KryptonButton(); - this.kryptonBorderEdge1 = new Krypton.Toolkit.KryptonBorderEdge(); - this.kryptonPanel2 = new Krypton.Toolkit.KryptonPanel(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.kryptonLabel1 = new Krypton.Toolkit.KryptonLabel(); - this.kryptonLabel2 = new Krypton.Toolkit.KryptonLabel(); - this.klbFiles = new Krypton.Toolkit.KryptonListBox(); - this.kmMain = new Krypton.Toolkit.KryptonManager(this.components); - this.kcmdInputDirectory = new Krypton.Toolkit.KryptonCommand(); - this.kcmdOutputDirectory = new Krypton.Toolkit.KryptonCommand(); - this.kcpbUpgrader = new Krypton.Toolkit.KryptonCustomPaletteBase(this.components); - this.ktxtInputDirectory = new Krypton.Toolkit.KryptonTextBox(); - this.bsaInputDirectory = new Krypton.Toolkit.ButtonSpecAny(); - this.ktxtOutputDirectory = new Krypton.Toolkit.KryptonTextBox(); - this.bsaOutputDirectory = new Krypton.Toolkit.ButtonSpecAny(); - this.kryptonContextMenu1 = new Krypton.Toolkit.KryptonContextMenu(); - this.kcmiOpenInExplorer = new Krypton.Toolkit.KryptonContextMenuItem(); - ((System.ComponentModel.ISupportInitialize)(this.kpnlTop)).BeginInit(); - this.kpnlTop.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit(); - this.kryptonPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel2)).BeginInit(); - this.kryptonPanel2.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // kpnlTop - // - this.kpnlTop.Controls.Add(this.kryptonWrapLabel1); - this.kpnlTop.Controls.Add(this.pictureBox1); - this.kpnlTop.Dock = System.Windows.Forms.DockStyle.Top; - this.kpnlTop.Location = new System.Drawing.Point(0, 0); - this.kpnlTop.Name = "kpnlTop"; - this.kpnlTop.PanelBackStyle = Krypton.Toolkit.PaletteBackStyle.ControlCustom1; - this.kpnlTop.Size = new System.Drawing.Size(804, 113); - this.kpnlTop.TabIndex = 2; - // - // kryptonWrapLabel1 - // - this.kryptonWrapLabel1.AutoSize = false; - this.kryptonWrapLabel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonWrapLabel1.Font = new System.Drawing.Font("Segoe UI", 13.5F, System.Drawing.FontStyle.Bold); - this.kryptonWrapLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(57)))), ((int)(((byte)(91))))); - this.kryptonWrapLabel1.LabelStyle = Krypton.Toolkit.LabelStyle.TitleControl; - this.kryptonWrapLabel1.Location = new System.Drawing.Point(0, 0); - this.kryptonWrapLabel1.Name = "kryptonWrapLabel1"; - this.kryptonWrapLabel1.Padding = new System.Windows.Forms.Padding(5); - this.kryptonWrapLabel1.Size = new System.Drawing.Size(694, 113); - this.kryptonWrapLabel1.Text = "Palette Upgrade Tool (Beta)"; - this.kryptonWrapLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // pictureBox1 - // - this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Right; - this.pictureBox1.Image = global::PaletteUpgradeTool.Properties.Resources.Krypton_Icon_64_x_64; - this.pictureBox1.Location = new System.Drawing.Point(694, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(110, 113); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pictureBox1.TabIndex = 2; - this.pictureBox1.TabStop = false; - // - // kryptonPanel1 - // - this.kryptonPanel1.Controls.Add(this.kbtnOptions); - this.kryptonPanel1.Controls.Add(this.kbtnUpgrade); - this.kryptonPanel1.Controls.Add(this.kbtnCancel); - this.kryptonPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.kryptonPanel1.Location = new System.Drawing.Point(0, 600); - this.kryptonPanel1.Name = "kryptonPanel1"; - this.kryptonPanel1.PanelBackStyle = Krypton.Toolkit.PaletteBackStyle.PanelAlternate; - this.kryptonPanel1.Size = new System.Drawing.Size(804, 50); - this.kryptonPanel1.TabIndex = 3; - // - // kbtnOptions - // - this.kbtnOptions.Location = new System.Drawing.Point(12, 13); - this.kbtnOptions.Name = "kbtnOptions"; - this.kbtnOptions.Size = new System.Drawing.Size(90, 25); - this.kbtnOptions.TabIndex = 2; - this.kbtnOptions.Values.DropDownArrowColor = System.Drawing.Color.Empty; - this.kbtnOptions.Values.Text = "O&ptions"; - this.kbtnOptions.Click += new System.EventHandler(this.kbtnOptions_Click); - // - // kbtnUpgrade - // - this.kbtnUpgrade.Enabled = false; - this.kbtnUpgrade.Location = new System.Drawing.Point(606, 13); - this.kbtnUpgrade.Name = "kbtnUpgrade"; - this.kbtnUpgrade.Size = new System.Drawing.Size(90, 25); - this.kbtnUpgrade.TabIndex = 1; - this.kbtnUpgrade.Values.DropDownArrowColor = System.Drawing.Color.Empty; - this.kbtnUpgrade.Values.Text = "&Upgrade"; - this.kbtnUpgrade.Click += new System.EventHandler(this.kbtnUpgrade_Click); - // - // kbtnCancel - // - this.kbtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.kbtnCancel.Location = new System.Drawing.Point(702, 13); - this.kbtnCancel.Name = "kbtnCancel"; - this.kbtnCancel.Size = new System.Drawing.Size(90, 25); - this.kbtnCancel.TabIndex = 0; - this.kbtnCancel.Values.DropDownArrowColor = System.Drawing.Color.Empty; - this.kbtnCancel.Values.Text = "Cance&l"; - this.kbtnCancel.Values.UseAsADialogButton = true; - this.kbtnCancel.Click += new System.EventHandler(this.kbtnCancel_Click); - // - // kryptonBorderEdge1 - // - this.kryptonBorderEdge1.BorderStyle = Krypton.Toolkit.PaletteBorderStyle.HeaderPrimary; - this.kryptonBorderEdge1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.kryptonBorderEdge1.Location = new System.Drawing.Point(0, 599); - this.kryptonBorderEdge1.Name = "kryptonBorderEdge1"; - this.kryptonBorderEdge1.Size = new System.Drawing.Size(804, 1); - this.kryptonBorderEdge1.Text = "kryptonBorderEdge1"; - // - // kryptonPanel2 - // - this.kryptonPanel2.Controls.Add(this.tableLayoutPanel1); - this.kryptonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonPanel2.Location = new System.Drawing.Point(0, 113); - this.kryptonPanel2.Name = "kryptonPanel2"; - this.kryptonPanel2.Size = new System.Drawing.Size(804, 486); - this.kryptonPanel2.TabIndex = 5; - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.BackColor = System.Drawing.Color.Transparent; - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.kryptonLabel1, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.kryptonLabel2, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.klbFiles, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.ktxtInputDirectory, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.ktxtOutputDirectory, 0, 4); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 5; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(804, 486); - this.tableLayoutPanel1.TabIndex = 2; - // - // kryptonLabel1 - // - this.kryptonLabel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonLabel1.LabelStyle = Krypton.Toolkit.LabelStyle.BoldPanel; - this.kryptonLabel1.Location = new System.Drawing.Point(3, 3); - this.kryptonLabel1.Name = "kryptonLabel1"; - this.kryptonLabel1.Size = new System.Drawing.Size(798, 20); - this.kryptonLabel1.TabIndex = 0; - this.kryptonLabel1.Values.Text = "Input Directory:"; - // - // kryptonLabel2 - // - this.kryptonLabel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.kryptonLabel2.LabelStyle = Krypton.Toolkit.LabelStyle.BoldPanel; - this.kryptonLabel2.Location = new System.Drawing.Point(3, 433); - this.kryptonLabel2.Name = "kryptonLabel2"; - this.kryptonLabel2.Size = new System.Drawing.Size(798, 20); - this.kryptonLabel2.TabIndex = 2; - this.kryptonLabel2.Values.Text = "Output Directory:"; - // - // klbFiles - // - this.klbFiles.Dock = System.Windows.Forms.DockStyle.Fill; - this.klbFiles.KryptonContextMenu = this.kryptonContextMenu1; - this.klbFiles.Location = new System.Drawing.Point(3, 59); - this.klbFiles.Name = "klbFiles"; - this.klbFiles.Size = new System.Drawing.Size(798, 368); - this.klbFiles.TabIndex = 4; - // - // kcmdInputDirectory - // - this.kcmdInputDirectory.Text = ".&.."; - this.kcmdInputDirectory.Execute += new System.EventHandler(this.kcmdInputDirectory_Execute); - // - // kcmdOutputDirectory - // - this.kcmdOutputDirectory.Text = ".&.."; - this.kcmdOutputDirectory.Execute += new System.EventHandler(this.kcmdOutputDirectory_Execute); - // - // kcpbUpgrader - // - this.kcpbUpgrader.BasePaletteType = Krypton.Toolkit.BasePaletteType.Custom; - this.kcpbUpgrader.ThemeName = null; - this.kcpbUpgrader.UseThemeFormChromeBorderWidth = Krypton.Toolkit.InheritBool.True; - // - // ktxtInputDirectory - // - this.ktxtInputDirectory.ButtonSpecs.Add(this.bsaInputDirectory); - this.ktxtInputDirectory.Dock = System.Windows.Forms.DockStyle.Fill; - this.ktxtInputDirectory.Location = new System.Drawing.Point(3, 29); - this.ktxtInputDirectory.Name = "ktxtInputDirectory"; - this.ktxtInputDirectory.Size = new System.Drawing.Size(798, 24); - this.ktxtInputDirectory.TabIndex = 5; - // - // bsaInputDirectory - // - this.bsaInputDirectory.Text = ".&.."; - this.bsaInputDirectory.UniqueName = "da6cc5d6a8ed49088147f9afc8973664"; - // - // ktxtOutputDirectory - // - this.ktxtOutputDirectory.ButtonSpecs.Add(this.bsaOutputDirectory); - this.ktxtOutputDirectory.Dock = System.Windows.Forms.DockStyle.Fill; - this.ktxtOutputDirectory.Location = new System.Drawing.Point(3, 459); - this.ktxtOutputDirectory.Name = "ktxtOutputDirectory"; - this.ktxtOutputDirectory.Size = new System.Drawing.Size(798, 24); - this.ktxtOutputDirectory.TabIndex = 6; - // - // bsaOutputDirectory - // - this.bsaOutputDirectory.Text = ".&.."; - this.bsaOutputDirectory.UniqueName = "ef206969f60646f387c04ab2e0d1750a"; - // - // kryptonContextMenu1 - // - this.kryptonContextMenu1.Items.AddRange(new Krypton.Toolkit.KryptonContextMenuItemBase[] { - this.kcmiOpenInExplorer}); - // - // kcmiOpenInExplorer - // - this.kcmiOpenInExplorer.Text = "Open in &Explorer"; - // - // PaletteUpgradeTool - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.kbtnCancel; - this.ClientSize = new System.Drawing.Size(804, 650); - this.Controls.Add(this.kryptonPanel2); - this.Controls.Add(this.kryptonBorderEdge1); - this.Controls.Add(this.kryptonPanel1); - this.Controls.Add(this.kpnlTop); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; - this.MaximizeBox = false; - this.Name = "PaletteUpgradeTool"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Palette Upgrade Tool"; - ((System.ComponentModel.ISupportInitialize)(this.kpnlTop)).EndInit(); - this.kpnlTop.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).EndInit(); - this.kryptonPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel2)).EndInit(); - this.kryptonPanel2.ResumeLayout(false); - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private Krypton.Toolkit.KryptonPanel kpnlTop; - private System.Windows.Forms.PictureBox pictureBox1; - private Krypton.Toolkit.KryptonWrapLabel kryptonWrapLabel1; - private Krypton.Toolkit.KryptonPanel kryptonPanel1; - private Krypton.Toolkit.KryptonBorderEdge kryptonBorderEdge1; - private Krypton.Toolkit.KryptonPanel kryptonPanel2; - private Krypton.Toolkit.KryptonButton kbtnCancel; - private Krypton.Toolkit.KryptonButton kbtnUpgrade; - private Krypton.Toolkit.KryptonButton kbtnOptions; - private Krypton.Toolkit.KryptonManager kmMain; - private Krypton.Toolkit.KryptonCommand kcmdInputDirectory; - private Krypton.Toolkit.KryptonCommand kcmdOutputDirectory; - private Krypton.Toolkit.KryptonCustomPaletteBase kcpbUpgrader; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private Krypton.Toolkit.KryptonLabel kryptonLabel1; - private Krypton.Toolkit.KryptonLabel kryptonLabel2; - private Krypton.Toolkit.KryptonListBox klbFiles; - private Krypton.Toolkit.KryptonTextBox ktxtInputDirectory; - private Krypton.Toolkit.ButtonSpecAny bsaInputDirectory; - private Krypton.Toolkit.KryptonTextBox ktxtOutputDirectory; - private Krypton.Toolkit.ButtonSpecAny bsaOutputDirectory; - private Krypton.Toolkit.KryptonContextMenu kryptonContextMenu1; - private Krypton.Toolkit.KryptonContextMenuItem kcmiOpenInExplorer; - } -} \ No newline at end of file diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.cs b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.cs deleted file mode 100644 index 7cbd379..0000000 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.cs +++ /dev/null @@ -1,156 +0,0 @@ -#region BSD License -/* - * New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE) - * Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2024 - 2024. All rights reserved. - */ -#endregion - -namespace PaletteUpgradeTool -{ - public partial class PaletteUpgradeToolTest : KryptonForm - { - public PaletteUpgradeToolTest() - { - InitializeComponent(); - - bsaInputDirectory.Click += InputDirectory_Click; - - bsaOutputDirectory.Click += OutputDirectory_Click; - - kcmiOpenInExplorer.Click += OpenInExplorer_Click; - } - - private void OpenInExplorer_Click(object sender, EventArgs e) - { - try - { - Process.Start("explorer.exe", klbFiles.GetItemText(klbFiles.SelectedItem)); - } - catch (Exception exception) - { - KryptonMessageBox.Show($"{exception.Message}"); - } - } - - private void OutputDirectory_Click(object sender, EventArgs e) - { - kcmdOutputDirectory.PerformExecute(); - } - - private void InputDirectory_Click(object sender, EventArgs e) - { - kcmdInputDirectory.PerformExecute(); - } - - private void kcmdInputDirectory_Execute(object sender, EventArgs e) - { - if (kmMain.UseKryptonFileDialogs) - { - KryptonFolderBrowserDialog dialog = new KryptonFolderBrowserDialog(); - - if (dialog.ShowDialog() == DialogResult.OK) - { - ktxtInputDirectory.Text = $@"{Path.GetFullPath(dialog.SelectedPath)}\"; - } - } - else - { - FolderBrowserDialog dialog = new FolderBrowserDialog(); - - dialog.ShowNewFolderButton = true; - - if (dialog.ShowDialog() == DialogResult.OK) - { - ktxtInputDirectory.Text = $@"{Path.GetFullPath(dialog.SelectedPath)}\"; - } - } - - FillListBox(); - } - - private void kcmdOutputDirectory_Execute(object sender, EventArgs e) - { - if (kmMain.UseKryptonFileDialogs) - { - KryptonFolderBrowserDialog dialog = new KryptonFolderBrowserDialog(); - - if (dialog.ShowDialog() == DialogResult.OK) - { - ktxtOutputDirectory.Text = $@"{Path.GetFullPath(dialog.SelectedPath)}\Palette Version {GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION}\"; - } - } - else - { - FolderBrowserDialog dialog = new FolderBrowserDialog(); - - dialog.ShowNewFolderButton = true; - - if (dialog.ShowDialog() == DialogResult.OK) - { - ktxtOutputDirectory.Text = $@"{Path.GetFullPath(dialog.SelectedPath)}\Palette Version {GlobalStaticValues.CURRENT_SUPPORTED_PALETTE_VERSION}\"; - } - } - - kbtnUpgrade.Enabled = true; - } - - private void kbtnOptions_Click(object sender, EventArgs e) - { - - } - - private void kbtnUpgrade_Click(object sender, EventArgs e) - { - // Validate output path to check if it exists - ValidateOutputPath(ktxtOutputDirectory.Text); - - // Loop through the file array - foreach (var paletteFile in GetPaletteFiles(ktxtInputDirectory.Text)) - { - // Upgrade the file and store it into the newly created directory - kcpbUpgrader.ImportWithUpgrade(File.OpenRead(Path.GetFullPath(paletteFile))); - - // Export the file - kcpbUpgrader.Export(File.OpenWrite($"{ktxtOutputDirectory}\\{paletteFile}.xml"), false); - } - } - - private void ValidateOutputPath(string path) - { - if (!Directory.Exists(path)) - { - Directory.CreateDirectory(path); - } - } - - private string[] GetPaletteFiles(string path) => Directory.GetFiles(path); - - private void ktxtInputDirectory_TextChanged(object sender, EventArgs e) - { - FillListBox(); - } - - private void FillListBox() - { - // Clear list box first - if (klbFiles.Items.Count > 0) - { - klbFiles.Items.Clear(); - } - - if (ktxtInputDirectory.Text.EndsWith("\\")) - { - // Fill listbox - foreach (var paletteFile in GetPaletteFiles(ktxtInputDirectory.Text)) - { - klbFiles.Items.Add(Path.GetFullPath(paletteFile)); - } - } - } - - private void kbtnCancel_Click(object sender, EventArgs e) - { - Close(); - } - } -} diff --git a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.resx b/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.resx deleted file mode 100644 index b778583..0000000 --- a/Applications/Source/Palette Upgrade Tool/Palette Upgrade Tool/UI/PaletteUpgradeToolTest.resx +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 574, 17 - - - 17, 17 - - - 115, 17 - - - 275, 17 - - - 445, 17 - - \ No newline at end of file diff --git a/Applications/Source/WixInstaller/README.md b/Applications/Source/WixInstaller/README.md new file mode 100644 index 0000000..c517406 --- /dev/null +++ b/Applications/Source/WixInstaller/README.md @@ -0,0 +1,11 @@ +# Standard-Toolkit-Palette Installer +- After building the release version of everything then, run this to create the `msi` installer file. + +## Requirements +- wix 4.0.6 (Or greater) via nuget (Not 5.x yet !) +- wix visx (`Heatwave`) VS integration installed +- All Toolkit Palette solution built in `Release` (Use the Explorer solution) + - Remeber to alter the version number in the Explorer Form.cs + - And the version numbers of the msi outputnames in eachof the installer projects +- A bit of time ;-) +- Push PR and then push msi's with a tagged build the same as the msi version name \ No newline at end of file diff --git a/Applications/Source/WixInstaller/RemovePdbs.xslt b/Applications/Source/WixInstaller/RemovePdbs.xslt new file mode 100644 index 0000000..e91d1db --- /dev/null +++ b/Applications/Source/WixInstaller/RemovePdbs.xslt @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/Applications/Source/WixInstaller/WixInstaller.net48/BasePath48.wxs b/Applications/Source/WixInstaller/WixInstaller.net48/BasePath48.wxs new file mode 100644 index 0000000..f7590b8 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net48/BasePath48.wxs @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net48/CheckFor.Net.wxs b/Applications/Source/WixInstaller/WixInstaller.net48/CheckFor.Net.wxs new file mode 100644 index 0000000..a5be017 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net48/CheckFor.Net.wxs @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Applications/Source/WixInstaller/WixInstaller.net48/KryptonToolkitPalette.wxs b/Applications/Source/WixInstaller/WixInstaller.net48/KryptonToolkitPalette.wxs new file mode 100644 index 0000000..274084c --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net48/KryptonToolkitPalette.wxs @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/Applications/Source/WixInstaller/WixInstaller.net48/License.rtf b/Applications/Source/WixInstaller/WixInstaller.net48/License.rtf new file mode 100644 index 0000000..21dad5b --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net48/License.rtf @@ -0,0 +1,227 @@ +{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang2057\deflangfe2057\themelang2057\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;} +{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;} +{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;} +{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f45\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f46\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\f48\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f49\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f50\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f51\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\f52\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f53\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f55\fbidi \fswiss\fcharset238\fprq2 Arial CE;}{\f56\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;} +{\f58\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f59\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f60\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f61\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);} +{\f62\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f63\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f385\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f386\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} +{\f388\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f389\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f392\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f393\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} +{\f415\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f416\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f418\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f419\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\f420\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f421\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f422\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f423\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);} +{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;} +{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);} +{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);} +{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} +{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}} +{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0; +\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap +\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 +\af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 \snext11 \ssemihidden \sunhideused +Normal Table;}}{\*\rsidtbl \rsid3037655\rsid3962205\rsid7102311\rsid13634997}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim0}{\info{\operator Peter Wagner} +{\creatim\yr2022\mo4\dy1\hr18\min27}{\revtim\yr2024\mo2\dy19\hr17\min16}{\version4}{\edmins0}{\nofpages2}{\nofwords230}{\nofchars1313}{\nofcharsws1540}{\vern93}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}} +\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 +\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale120\rsidroot3962205 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1 +\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5 +\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang +{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa160\sl252\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 +\fs22\lang2057\langfe2057\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 {\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid3037655 \hich\af1\dbch\af31505\loch\f1 BSD 3-Clause License +\par +\par \hich\af1\dbch\af31505\loch\f1 Copyright (c) 2017 - 202}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid7102311 \hich\af1\dbch\af31505\loch\f1 4}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid3037655 \hich\af1\dbch\af31505\loch\f1 +, Peter Wagner & Simon Coghlan, et al. +\par \hich\af1\dbch\af31505\loch\f1 All rights reserved. +\par +\par \hich\af1\dbch\af31505\loch\f1 Redistribution and use in source and binary forms, with or without +\par \hich\af1\dbch\af31505\loch\f1 modification, are permitted provided that the following conditions are met: +\par +\par \hich\af1\dbch\af31505\loch\f1 * Redistributions of source code must retain the above copyright notice, this +\par \hich\af1\dbch\af31505\loch\f1 list of conditions and the following disclaimer. +\par +\par \hich\af1\dbch\af31505\loch\f1 * Redistributions in binary form must reproduce the above copyright notice, +\par \hich\af1\dbch\af31505\loch\f1 this list of conditions and the following disclaimer in the documentation +\par \hich\af1\dbch\af31505\loch\f1 and/or other materials provided with the distribution. +\par +\par \hich\af1\dbch\af31505\loch\f1 * Neither the name of the co\hich\af1\dbch\af31505\loch\f1 pyright holder nor the names of its +\par \hich\af1\dbch\af31505\loch\f1 contributors may be used to endorse or promote products derived from +\par \hich\af1\dbch\af31505\loch\f1 this software without specific prior written permission. +\par +\par \hich\af1\dbch\af31505\loch\f1 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +\par \hich\af1\dbch\af31505\loch\f1 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +\par \hich\af1\dbch\af31505\loch\f1 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +\par \hich\af1\dbch\af31505\loch\f1 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +\par \hich\af1\dbch\af31505\loch\f1 FOR ANY DIRECT, INDIRECT, INCIDENTAL, S\hich\af1\dbch\af31505\loch\f1 PECIAL, EXEMPLARY, OR CONSEQUENTIAL +\par \hich\af1\dbch\af31505\loch\f1 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +\par \hich\af1\dbch\af31505\loch\f1 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +\par \hich\af1\dbch\af31505\loch\f1 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +\par \hich\af1\dbch\af31505\loch\f1 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +\par \hich\af1\dbch\af31505\loch\f1 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f +7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd +ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d +7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b +d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52 +fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71 +b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b +fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567 +9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd +79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf +5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2 +d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1 +738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68 +2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac +5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a +b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9 +493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2 +be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f +f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64 +7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e +b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4 +6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd +f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d +7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39 +4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf +1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a +faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2 +67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9 +416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27 +1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b +8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4 +8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65 +2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36 +3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e +3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985 +0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000 +0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000 +000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000 +7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000 +000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000 +000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000} +{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d +617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; +\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid; +\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid; +\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1; +\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1; +\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; +\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2; +\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3; +\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; +\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000 +02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000500d +575a5763da01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net48/Product.wxs b/Applications/Source/WixInstaller/WixInstaller.net48/Product.wxs new file mode 100644 index 0000000..00fd36e --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net48/Product.wxs @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Applications/Source/WixInstaller/WixInstaller.net48/WixInstaller.net48.wax b/Applications/Source/WixInstaller/WixInstaller.net48/WixInstaller.net48.wax new file mode 100644 index 0000000..ff93104 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net48/WixInstaller.net48.wax @@ -0,0 +1,10 @@ + + + + + + false + true + false + - + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net48/WixInstaller.net48.wixproj b/Applications/Source/WixInstaller/WixInstaller.net48/WixInstaller.net48.wixproj new file mode 100644 index 0000000..f0ce7e1 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net48/WixInstaller.net48.wixproj @@ -0,0 +1,59 @@ + + + + false + {1f549957-446d-427a-9930-7b48231d8253} + + + + + Samples.v90.24.11.317.Net48 + WixInstaller.net48 + + + Debug + False + True + True + True + ..\..\..\Binaries\Installers + + + False + True + True + True + + + + + + + + + + + + + + + + ..\..\..\Binaries\Krypton Palette\Release\net48 + BasePath48=..\..\..\Binaries\Krypton Palette\Release\net48 + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net48/packages.config b/Applications/Source/WixInstaller/WixInstaller.net48/packages.config new file mode 100644 index 0000000..f27604b --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net48/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net80/BasePath80.wxs b/Applications/Source/WixInstaller/WixInstaller.net80/BasePath80.wxs new file mode 100644 index 0000000..4ab2893 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net80/BasePath80.wxs @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net80/KryptonToolkitPalette.wxs b/Applications/Source/WixInstaller/WixInstaller.net80/KryptonToolkitPalette.wxs new file mode 100644 index 0000000..1ea7c7f --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net80/KryptonToolkitPalette.wxs @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/Applications/Source/WixInstaller/WixInstaller.net80/License.rtf b/Applications/Source/WixInstaller/WixInstaller.net80/License.rtf new file mode 100644 index 0000000..b7332b1 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net80/License.rtf @@ -0,0 +1,227 @@ +{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang2057\deflangfe2057\themelang2057\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;} +{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;} +{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;} +{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f45\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f46\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\f48\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f49\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f50\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f51\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\f52\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f53\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f55\fbidi \fswiss\fcharset238\fprq2 Arial CE;}{\f56\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;} +{\f58\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f59\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f60\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f61\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);} +{\f62\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f63\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f385\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f386\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} +{\f388\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f389\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f392\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f393\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} +{\f415\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f416\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f418\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f419\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\f420\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f421\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f422\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f423\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);} +{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;} +{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);} +{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);} +{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} +{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}} +{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0; +\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap +\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 +\af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 \snext11 \ssemihidden \sunhideused +Normal Table;}}{\*\rsidtbl \rsid5245457\rsid5376249\rsid8061242\rsid13323281}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim0}{\info{\operator Peter Wagner} +{\creatim\yr2022\mo4\dy1\hr18\min28}{\revtim\yr2024\mo2\dy19\hr17\min16}{\version4}{\edmins1}{\nofpages2}{\nofwords230}{\nofchars1313}{\nofcharsws1540}{\vern93}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}} +\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 +\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale120\rsidroot8061242 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1 +\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5 +\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang +{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa160\sl252\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 +\fs22\lang2057\langfe2057\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 {\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid13323281 \hich\af1\dbch\af31505\loch\f1 BSD 3-Clause License +\par +\par \hich\af1\dbch\af31505\loch\f1 Copyright (c) 2017 - 202}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid5376249 \hich\af1\dbch\af31505\loch\f1 4}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid13323281 \hich\af1\dbch\af31505\loch\f1 +, Peter Wagner & Simon Coghlan, et al. +\par \hich\af1\dbch\af31505\loch\f1 All rights reserved. +\par +\par \hich\af1\dbch\af31505\loch\f1 Redistribution and use in source and binary forms, with or without +\par \hich\af1\dbch\af31505\loch\f1 modification, are permitted provided that the following conditions are met: +\par +\par \hich\af1\dbch\af31505\loch\f1 * Redistributions of source code must retain the above copyright notice, this +\par \hich\af1\dbch\af31505\loch\f1 list of conditions and the following disclaimer. +\par +\par \hich\af1\dbch\af31505\loch\f1 * Redistributions in binary form must reproduce the above copyright notice, +\par \hich\af1\dbch\af31505\loch\f1 this list of conditions and the following disclaimer in the documentation +\par \hich\af1\dbch\af31505\loch\f1 and/or other materials provided with the distribution. +\par +\par \hich\af1\dbch\af31505\loch\f1 * Neither the name of the co\hich\af1\dbch\af31505\loch\f1 pyright holder nor the names of its +\par \hich\af1\dbch\af31505\loch\f1 contributors may be used to endorse or promote products derived from +\par \hich\af1\dbch\af31505\loch\f1 this software without specific prior written permission. +\par +\par \hich\af1\dbch\af31505\loch\f1 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +\par \hich\af1\dbch\af31505\loch\f1 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +\par \hich\af1\dbch\af31505\loch\f1 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +\par \hich\af1\dbch\af31505\loch\f1 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +\par \hich\af1\dbch\af31505\loch\f1 FOR ANY DIRECT, INDIRECT, INCIDENTAL, S\hich\af1\dbch\af31505\loch\f1 PECIAL, EXEMPLARY, OR CONSEQUENTIAL +\par \hich\af1\dbch\af31505\loch\f1 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +\par \hich\af1\dbch\af31505\loch\f1 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +\par \hich\af1\dbch\af31505\loch\f1 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +\par \hich\af1\dbch\af31505\loch\f1 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +\par \hich\af1\dbch\af31505\loch\f1 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f +7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd +ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d +7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b +d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52 +fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71 +b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b +fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567 +9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd +79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf +5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2 +d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1 +738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68 +2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac +5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a +b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9 +493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2 +be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f +f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64 +7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e +b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4 +6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd +f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d +7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39 +4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf +1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a +faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2 +67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9 +416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27 +1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b +8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4 +8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65 +2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36 +3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e +3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985 +0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000 +0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000 +000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000 +7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000 +000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000 +000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000} +{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d +617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; +\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid; +\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid; +\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1; +\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1; +\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; +\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2; +\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3; +\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; +\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000 +02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000009038 +02535763da01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net80/Product.wxs b/Applications/Source/WixInstaller/WixInstaller.net80/Product.wxs new file mode 100644 index 0000000..416e474 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net80/Product.wxs @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Applications/Source/WixInstaller/WixInstaller.net80/WixInstaller.net80.wax b/Applications/Source/WixInstaller/WixInstaller.net80/WixInstaller.net80.wax new file mode 100644 index 0000000..881dbf9 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net80/WixInstaller.net80.wax @@ -0,0 +1,10 @@ + + + + + + false + true + false + - + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net80/WixInstaller.net80.wixproj b/Applications/Source/WixInstaller/WixInstaller.net80/WixInstaller.net80.wixproj new file mode 100644 index 0000000..b4294b4 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net80/WixInstaller.net80.wixproj @@ -0,0 +1,47 @@ + + + + Samples.v90.24.11.317.Net80 + {3634bdd0-9fc5-4744-8902-6dd127ad4321} + + + + + Debug + ..\..\..\Binaries\Installers\ + + + True + False + True + True + + + + + + + + + + + + ..\..\..\Binaries\Krypton Palette\Release\net8.0-windows + BasePath80=..\..\..\Binaries\Krypton Palette\Release\net8.0-windows + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net80/packages.config b/Applications/Source/WixInstaller/WixInstaller.net80/packages.config new file mode 100644 index 0000000..f27604b --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net80/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net90/BasePath90.wxs b/Applications/Source/WixInstaller/WixInstaller.net90/BasePath90.wxs new file mode 100644 index 0000000..fb931db --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net90/BasePath90.wxs @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net90/KryptonToolkitPalette.wxs b/Applications/Source/WixInstaller/WixInstaller.net90/KryptonToolkitPalette.wxs new file mode 100644 index 0000000..fcdd47a --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net90/KryptonToolkitPalette.wxs @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + diff --git a/Applications/Source/WixInstaller/WixInstaller.net90/License.rtf b/Applications/Source/WixInstaller/WixInstaller.net90/License.rtf new file mode 100644 index 0000000..af81958 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net90/License.rtf @@ -0,0 +1,227 @@ +{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang2057\deflangfe2057\themelang2057\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;} +{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;} +{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;} +{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f45\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f46\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\f48\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f49\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f50\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f51\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\f52\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f53\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f55\fbidi \fswiss\fcharset238\fprq2 Arial CE;}{\f56\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;} +{\f58\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f59\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f60\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f61\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);} +{\f62\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f63\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f385\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f386\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} +{\f388\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f389\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f392\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f393\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} +{\f415\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f416\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f418\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f419\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\f420\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f421\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f422\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f423\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);} +{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;} +{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);} +{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);} +{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} +{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}} +{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0; +\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap +\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 +\af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 \snext11 \ssemihidden \sunhideused +Normal Table;}}{\*\rsidtbl \rsid5245457\rsid8061242\rsid12935683\rsid13323281}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim0}{\info{\operator Peter Wagner} +{\creatim\yr2022\mo4\dy1\hr18\min28}{\revtim\yr2024\mo2\dy19\hr17\min15}{\version4}{\edmins0}{\nofpages2}{\nofwords230}{\nofchars1313}{\nofcharsws1540}{\vern93}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}} +\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 +\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale120\rsidroot8061242 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1 +\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5 +\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang +{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa160\sl252\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 +\fs22\lang2057\langfe2057\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 {\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid13323281 \hich\af1\dbch\af31505\loch\f1 BSD 3-Clause License +\par +\par \hich\af1\dbch\af31505\loch\f1 Copyright (c) 2017 - 202}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid12935683 \hich\af1\dbch\af31505\loch\f1 4}{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\insrsid13323281 \hich\af1\dbch\af31505\loch\f1 +, Peter Wagner & Simon Coghlan, et al. +\par \hich\af1\dbch\af31505\loch\f1 All rights reserved. +\par +\par \hich\af1\dbch\af31505\loch\f1 Redistribution and use in source and binary forms, with or without +\par \hich\af1\dbch\af31505\loch\f1 modification, are permitted provided that the following conditions are met: +\par +\par \hich\af1\dbch\af31505\loch\f1 * Redistributions of source code must retain the above copyright notice, this +\par \hich\af1\dbch\af31505\loch\f1 list of conditions and the following disclaimer. +\par +\par \hich\af1\dbch\af31505\loch\f1 * Redistributions in binary form must reproduce the above copyright notice, +\par \hich\af1\dbch\af31505\loch\f1 this list of conditions and the following disclaimer in the documentation +\par \hich\af1\dbch\af31505\loch\f1 and/or other materials provided with the distribution. +\par +\par \hich\af1\dbch\af31505\loch\f1 * Neither the name of the co\hich\af1\dbch\af31505\loch\f1 pyright holder nor the names of its +\par \hich\af1\dbch\af31505\loch\f1 contributors may be used to endorse or promote products derived from +\par \hich\af1\dbch\af31505\loch\f1 this software without specific prior written permission. +\par +\par \hich\af1\dbch\af31505\loch\f1 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +\par \hich\af1\dbch\af31505\loch\f1 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +\par \hich\af1\dbch\af31505\loch\f1 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +\par \hich\af1\dbch\af31505\loch\f1 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +\par \hich\af1\dbch\af31505\loch\f1 FOR ANY DIRECT, INDIRECT, INCIDENTAL, S\hich\af1\dbch\af31505\loch\f1 PECIAL, EXEMPLARY, OR CONSEQUENTIAL +\par \hich\af1\dbch\af31505\loch\f1 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +\par \hich\af1\dbch\af31505\loch\f1 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +\par \hich\af1\dbch\af31505\loch\f1 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +\par \hich\af1\dbch\af31505\loch\f1 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +\par \hich\af1\dbch\af31505\loch\f1 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f +7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd +ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d +7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b +d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52 +fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71 +b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b +fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567 +9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd +79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf +5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2 +d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1 +738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68 +2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac +5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a +b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9 +493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2 +be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f +f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64 +7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e +b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4 +6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd +f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d +7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39 +4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf +1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a +faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2 +67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9 +416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27 +1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b +8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4 +8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65 +2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36 +3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e +3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985 +0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000 +0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000 +000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000 +7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000 +000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000 +000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000} +{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d +617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; +\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid; +\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid; +\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1; +\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1; +\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; +\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2; +\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3; +\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; +\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000 +02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000600b +62415763da01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net90/Product.wxs b/Applications/Source/WixInstaller/WixInstaller.net90/Product.wxs new file mode 100644 index 0000000..f776a68 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net90/Product.wxs @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Applications/Source/WixInstaller/WixInstaller.net90/WixInstaller.net90.wax b/Applications/Source/WixInstaller/WixInstaller.net90/WixInstaller.net90.wax new file mode 100644 index 0000000..881dbf9 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net90/WixInstaller.net90.wax @@ -0,0 +1,10 @@ + + + + + + false + true + false + - + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net90/WixInstaller.net90.wixproj b/Applications/Source/WixInstaller/WixInstaller.net90/WixInstaller.net90.wixproj new file mode 100644 index 0000000..c9b12df --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net90/WixInstaller.net90.wixproj @@ -0,0 +1,47 @@ + + + + Samples.v90.24.11.317.Net90 + {196eea81-fd87-4a46-b370-33268766e2b6} + + + + + Debug + ..\..\..\Binaries\Installers\ + + + True + False + True + True + + + + + + + + + + + + ..\..\..\Binaries\Krypton Palette\Release\net9.0-windows + BasePath90=..\..\..\Binaries\Krypton Palette\Release\net9.0-windows + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.net90/packages.config b/Applications/Source/WixInstaller/WixInstaller.net90/packages.config new file mode 100644 index 0000000..f27604b --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.net90/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Applications/Source/WixInstaller/WixInstaller.sln b/Applications/Source/WixInstaller/WixInstaller.sln new file mode 100644 index 0000000..fd46384 --- /dev/null +++ b/Applications/Source/WixInstaller/WixInstaller.sln @@ -0,0 +1,72 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33103.201 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C3079C96-78BB-4281-8946-956A6D34CDF3}" + ProjectSection(SolutionItems) = preProject + ..\..\.gitignore = ..\..\.gitignore + ..\..\LICENSE = ..\..\LICENSE + README.md = README.md + EndProjectSection +EndProject +Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "WixInstaller.net48", "WixInstaller.net48\WixInstaller.net48.wixproj", "{1F549957-446D-427A-9930-7B48231D8253}" +EndProject +Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "WixInstaller.net80", "WixInstaller.net80\WixInstaller.net80.wixproj", "{3634BDD0-9FC5-4744-8902-6DD127AD4321}" +EndProject +Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "WixInstaller.net90", "WixInstaller.net90\WixInstaller.net90.wixproj", "{196EEA81-FD87-4A46-B370-33268766E2B6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1F549957-446D-427A-9930-7B48231D8253}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1F549957-446D-427A-9930-7B48231D8253}.Debug|ARM64.Build.0 = Debug|ARM64 + {1F549957-446D-427A-9930-7B48231D8253}.Debug|x64.ActiveCfg = Debug|x64 + {1F549957-446D-427A-9930-7B48231D8253}.Debug|x64.Build.0 = Debug|x64 + {1F549957-446D-427A-9930-7B48231D8253}.Debug|x86.ActiveCfg = Debug|x86 + {1F549957-446D-427A-9930-7B48231D8253}.Debug|x86.Build.0 = Debug|x86 + {1F549957-446D-427A-9930-7B48231D8253}.Release|ARM64.ActiveCfg = Release|ARM64 + {1F549957-446D-427A-9930-7B48231D8253}.Release|ARM64.Build.0 = Release|ARM64 + {1F549957-446D-427A-9930-7B48231D8253}.Release|x64.ActiveCfg = Release|x64 + {1F549957-446D-427A-9930-7B48231D8253}.Release|x64.Build.0 = Release|x64 + {1F549957-446D-427A-9930-7B48231D8253}.Release|x86.ActiveCfg = Release|x86 + {1F549957-446D-427A-9930-7B48231D8253}.Release|x86.Build.0 = Release|x86 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Debug|ARM64.Build.0 = Debug|ARM64 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Debug|x64.ActiveCfg = Debug|x64 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Debug|x64.Build.0 = Debug|x64 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Debug|x86.ActiveCfg = Debug|x86 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Debug|x86.Build.0 = Debug|x86 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Release|ARM64.ActiveCfg = Release|ARM64 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Release|ARM64.Build.0 = Release|ARM64 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Release|x64.ActiveCfg = Release|x64 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Release|x64.Build.0 = Release|x64 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Release|x86.ActiveCfg = Release|x86 + {3634BDD0-9FC5-4744-8902-6DD127AD4321}.Release|x86.Build.0 = Release|x86 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Debug|ARM64.Build.0 = Debug|ARM64 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Debug|x64.ActiveCfg = Debug|x64 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Debug|x64.Build.0 = Debug|x64 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Debug|x86.ActiveCfg = Debug|x86 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Debug|x86.Build.0 = Debug|x86 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Release|ARM64.ActiveCfg = Release|ARM64 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Release|ARM64.Build.0 = Release|ARM64 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Release|x64.ActiveCfg = Release|x64 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Release|x64.Build.0 = Release|x64 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Release|x86.ActiveCfg = Release|x86 + {196EEA81-FD87-4A46-B370-33268766E2B6}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {ACCC64D1-AADB-4912-BDD8-7B1D118CB5F2} + EndGlobalSection +EndGlobal diff --git a/Palettes/Community/Themes by Byte#7189/Adobe CC Dark by Byte#7189_v21.xml b/Palettes/Community/Themes by Byte#7189/Adobe CC Dark by Byte#7189_v21.xml index c54ac41..f751b01 100644 --- a/Palettes/Community/Themes by Byte#7189/Adobe CC Dark by Byte#7189_v21.xml +++ b/Palettes/Community/Themes by Byte#7189/Adobe CC Dark by Byte#7189_v21.xml @@ -2,7 +2,7 @@ - +