diff --git a/FlashpointInstaller/FlashpointInstaller.csproj b/FlashpointInstaller/FlashpointInstaller.csproj
index 30d88fe..89156b2 100644
--- a/FlashpointInstaller/FlashpointInstaller.csproj
+++ b/FlashpointInstaller/FlashpointInstaller.csproj
@@ -47,7 +47,8 @@
pdbonly
true
bin\Release\
- TRACE
+
+
prompt
4
false
@@ -297,6 +298,7 @@
Main.cs
+ Designer
ResXFileCodeGenerator
diff --git a/FlashpointInstaller/Properties/AssemblyInfo.cs b/FlashpointInstaller/Properties/AssemblyInfo.cs
index 000c092..0b9ada9 100644
--- a/FlashpointInstaller/Properties/AssemblyInfo.cs
+++ b/FlashpointInstaller/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
// 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("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.11")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2")]
diff --git a/FlashpointInstaller/src/Common.cs b/FlashpointInstaller/src/Common.cs
index 2901624..dc10fa1 100644
--- a/FlashpointInstaller/src/Common.cs
+++ b/FlashpointInstaller/src/Common.cs
@@ -151,7 +151,7 @@ public static class FPM
// Pointer to main form
public static Main Main { get => (Main)Application.OpenForms["Main"]; }
// Internet location of component list XML
- public static string ListURL { get; set; } = "https://nexus-dev.unstable.life/repository/stable/components.xml";
+ public static string ListURL { get; set; } = "https://nexus-dev.flashpointarchive.org/repository/stable/components.xml";
// The parsed component list XML
public static XmlDocument XmlTree { get; set; }
// WebClient instance used to download files
diff --git a/FlashpointInstaller/src/Forms/Main.Designer.cs b/FlashpointInstaller/src/Forms/Main.Designer.cs
index f57df98..dd38066 100644
--- a/FlashpointInstaller/src/Forms/Main.Designer.cs
+++ b/FlashpointInstaller/src/Forms/Main.Designer.cs
@@ -55,9 +55,10 @@ private void InitializeComponent()
// Logo
//
this.Logo.Image = ((System.Drawing.Image)(resources.GetObject("Logo.Image")));
- this.Logo.Location = new System.Drawing.Point(21, 12);
+ this.Logo.Location = new System.Drawing.Point(32, 18);
+ this.Logo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Logo.Name = "Logo";
- this.Logo.Size = new System.Drawing.Size(591, 177);
+ this.Logo.Size = new System.Drawing.Size(886, 272);
this.Logo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.Logo.TabIndex = 0;
this.Logo.TabStop = false;
@@ -65,9 +66,10 @@ private void InitializeComponent()
// About
//
this.About.AutoSize = true;
- this.About.Location = new System.Drawing.Point(18, 192);
+ this.About.Location = new System.Drawing.Point(27, 295);
+ this.About.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.About.Name = "About";
- this.About.Size = new System.Drawing.Size(94, 13);
+ this.About.Size = new System.Drawing.Size(143, 20);
this.About.TabIndex = 0;
this.About.Text = "Flashpoint Installer";
//
@@ -76,9 +78,11 @@ private void InitializeComponent()
this.DestinationPathBox.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.DestinationPathBox.Controls.Add(this.DestinationPath);
this.DestinationPathBox.Controls.Add(this.DestinationPathBrowse);
- this.DestinationPathBox.Location = new System.Drawing.Point(12, 384);
+ this.DestinationPathBox.Location = new System.Drawing.Point(18, 591);
+ this.DestinationPathBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.DestinationPathBox.Name = "DestinationPathBox";
- this.DestinationPathBox.Size = new System.Drawing.Size(600, 49);
+ this.DestinationPathBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.DestinationPathBox.Size = new System.Drawing.Size(900, 75);
this.DestinationPathBox.TabIndex = 6;
this.DestinationPathBox.TabStop = false;
this.DestinationPathBox.Text = "Destination Folder";
@@ -86,17 +90,19 @@ private void InitializeComponent()
// DestinationPath
//
this.DestinationPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.DestinationPath.Location = new System.Drawing.Point(9, 18);
+ this.DestinationPath.Location = new System.Drawing.Point(14, 28);
+ this.DestinationPath.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.DestinationPath.Name = "DestinationPath";
- this.DestinationPath.Size = new System.Drawing.Size(503, 20);
+ this.DestinationPath.Size = new System.Drawing.Size(752, 26);
this.DestinationPath.TabIndex = 0;
this.DestinationPath.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.DestinationPath_KeyPress);
//
// DestinationPathBrowse
//
- this.DestinationPathBrowse.Location = new System.Drawing.Point(519, 17);
+ this.DestinationPathBrowse.Location = new System.Drawing.Point(778, 26);
+ this.DestinationPathBrowse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.DestinationPathBrowse.Name = "DestinationPathBrowse";
- this.DestinationPathBrowse.Size = new System.Drawing.Size(73, 22);
+ this.DestinationPathBrowse.Size = new System.Drawing.Size(110, 34);
this.DestinationPathBrowse.TabIndex = 1;
this.DestinationPathBrowse.Text = "&Browse";
this.DestinationPathBrowse.UseVisualStyleBackColor = true;
@@ -105,9 +111,10 @@ private void InitializeComponent()
// InstallButton
//
this.InstallButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.InstallButton.Location = new System.Drawing.Point(300, 443);
+ this.InstallButton.Location = new System.Drawing.Point(450, 682);
+ this.InstallButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.InstallButton.Name = "InstallButton";
- this.InstallButton.Size = new System.Drawing.Size(313, 26);
+ this.InstallButton.Size = new System.Drawing.Size(470, 40);
this.InstallButton.TabIndex = 8;
this.InstallButton.Text = "&Install Flashpoint";
this.InstallButton.UseVisualStyleBackColor = true;
@@ -117,21 +124,23 @@ private void InitializeComponent()
//
this.Link.AutoSize = true;
this.Link.LinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(4)))), ((int)(((byte)(94)))), ((int)(((byte)(221)))));
- this.Link.Location = new System.Drawing.Point(441, 192);
+ this.Link.Location = new System.Drawing.Point(713, 295);
+ this.Link.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.Link.Name = "Link";
- this.Link.Size = new System.Drawing.Size(171, 13);
+ this.Link.Size = new System.Drawing.Size(207, 20);
this.Link.TabIndex = 1;
this.Link.TabStop = true;
- this.Link.Text = "https://bluemaxima.org/flashpoint/";
+ this.Link.Text = "https://flashpointarchive.org/";
this.Link.TextAlign = System.Drawing.ContentAlignment.TopRight;
this.Link.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.Link_LinkClicked);
//
// Message2
//
this.Message2.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.Message2.Location = new System.Drawing.Point(415, 257);
+ this.Message2.Location = new System.Drawing.Point(622, 395);
+ this.Message2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.Message2.Name = "Message2";
- this.Message2.Size = new System.Drawing.Size(197, 30);
+ this.Message2.Size = new System.Drawing.Size(296, 46);
this.Message2.TabIndex = 4;
this.Message2.Text = "Click on a component or category to learn more about it.";
//
@@ -139,10 +148,11 @@ private void InitializeComponent()
//
this.DescriptionBox.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.DescriptionBox.Controls.Add(this.Description);
- this.DescriptionBox.Location = new System.Drawing.Point(415, 305);
+ this.DescriptionBox.Location = new System.Drawing.Point(622, 469);
+ this.DescriptionBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.DescriptionBox.Name = "DescriptionBox";
- this.DescriptionBox.Padding = new System.Windows.Forms.Padding(10, 8, 10, 10);
- this.DescriptionBox.Size = new System.Drawing.Size(197, 72);
+ this.DescriptionBox.Padding = new System.Windows.Forms.Padding(15, 12, 15, 15);
+ this.DescriptionBox.Size = new System.Drawing.Size(296, 111);
this.DescriptionBox.TabIndex = 5;
this.DescriptionBox.TabStop = false;
this.DescriptionBox.Text = "Component Description";
@@ -150,9 +160,10 @@ private void InitializeComponent()
//
// Description
//
- this.Description.Location = new System.Drawing.Point(10, 21);
+ this.Description.Location = new System.Drawing.Point(15, 32);
+ this.Description.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.Description.Name = "Description";
- this.Description.Size = new System.Drawing.Size(177, 41);
+ this.Description.Size = new System.Drawing.Size(266, 63);
this.Description.TabIndex = 0;
//
// ShortcutTable
@@ -165,11 +176,12 @@ private void InitializeComponent()
this.ShortcutTable.Controls.Add(this.ShortcutStartMenu, 2, 0);
this.ShortcutTable.Controls.Add(this.ShortcutDesktop, 1, 0);
this.ShortcutTable.Controls.Add(this.ShortcutLabel, 0, 0);
- this.ShortcutTable.Location = new System.Drawing.Point(12, 442);
+ this.ShortcutTable.Location = new System.Drawing.Point(18, 680);
+ this.ShortcutTable.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ShortcutTable.Name = "ShortcutTable";
this.ShortcutTable.RowCount = 1;
this.ShortcutTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.ShortcutTable.Size = new System.Drawing.Size(274, 26);
+ this.ShortcutTable.Size = new System.Drawing.Size(411, 40);
this.ShortcutTable.TabIndex = 7;
//
// ShortcutStartMenu
@@ -177,10 +189,11 @@ private void InitializeComponent()
this.ShortcutStartMenu.AutoSize = true;
this.ShortcutStartMenu.Checked = true;
this.ShortcutStartMenu.CheckState = System.Windows.Forms.CheckState.Checked;
- this.ShortcutStartMenu.Location = new System.Drawing.Point(193, 3);
+ this.ShortcutStartMenu.Location = new System.Drawing.Point(293, 5);
+ this.ShortcutStartMenu.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ShortcutStartMenu.Name = "ShortcutStartMenu";
- this.ShortcutStartMenu.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0);
- this.ShortcutStartMenu.Size = new System.Drawing.Size(78, 20);
+ this.ShortcutStartMenu.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
+ this.ShortcutStartMenu.Size = new System.Drawing.Size(114, 29);
this.ShortcutStartMenu.TabIndex = 2;
this.ShortcutStartMenu.Text = "&Start Menu";
this.ShortcutStartMenu.UseVisualStyleBackColor = true;
@@ -190,10 +203,11 @@ private void InitializeComponent()
this.ShortcutDesktop.AutoSize = true;
this.ShortcutDesktop.Checked = true;
this.ShortcutDesktop.CheckState = System.Windows.Forms.CheckState.Checked;
- this.ShortcutDesktop.Location = new System.Drawing.Point(121, 3);
+ this.ShortcutDesktop.Location = new System.Drawing.Point(190, 5);
+ this.ShortcutDesktop.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ShortcutDesktop.Name = "ShortcutDesktop";
- this.ShortcutDesktop.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0);
- this.ShortcutDesktop.Size = new System.Drawing.Size(66, 20);
+ this.ShortcutDesktop.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
+ this.ShortcutDesktop.Size = new System.Drawing.Size(95, 29);
this.ShortcutDesktop.TabIndex = 1;
this.ShortcutDesktop.Text = "&Desktop";
this.ShortcutDesktop.UseVisualStyleBackColor = true;
@@ -202,10 +216,10 @@ private void InitializeComponent()
//
this.ShortcutLabel.AutoSize = true;
this.ShortcutLabel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ShortcutLabel.Location = new System.Drawing.Point(3, 3);
- this.ShortcutLabel.Margin = new System.Windows.Forms.Padding(3);
+ this.ShortcutLabel.Location = new System.Drawing.Point(4, 5);
+ this.ShortcutLabel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ShortcutLabel.Name = "ShortcutLabel";
- this.ShortcutLabel.Size = new System.Drawing.Size(112, 20);
+ this.ShortcutLabel.Size = new System.Drawing.Size(178, 30);
this.ShortcutLabel.TabIndex = 0;
this.ShortcutLabel.Text = "Create shortcuts in:";
this.ShortcutLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -213,9 +227,10 @@ private void InitializeComponent()
// Message
//
this.Message.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.Message.Location = new System.Drawing.Point(415, 225);
+ this.Message.Location = new System.Drawing.Point(622, 346);
+ this.Message.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.Message.Name = "Message";
- this.Message.Size = new System.Drawing.Size(197, 30);
+ this.Message.Size = new System.Drawing.Size(296, 46);
this.Message.TabIndex = 3;
this.Message.Text = "Choose components to include in your Flashpoint installation.";
//
@@ -223,9 +238,10 @@ private void InitializeComponent()
//
this.ComponentList.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.ComponentList.Indent = 20;
- this.ComponentList.Location = new System.Drawing.Point(21, 220);
+ this.ComponentList.Location = new System.Drawing.Point(32, 338);
+ this.ComponentList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ComponentList.Name = "ComponentList";
- this.ComponentList.Size = new System.Drawing.Size(384, 156);
+ this.ComponentList.Size = new System.Drawing.Size(574, 238);
this.ComponentList.TabIndex = 2;
this.ComponentList.TriStateStyleProperty = RikTheVeggie.TriStateTreeView.TriStateStyles.Installer;
this.ComponentList.BeforeCheck += new System.Windows.Forms.TreeViewCancelEventHandler(this.ComponentList_BeforeCheck);
@@ -234,9 +250,9 @@ private void InitializeComponent()
//
// Main
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(624, 481);
+ this.ClientSize = new System.Drawing.Size(936, 740);
this.Controls.Add(this.DescriptionBox);
this.Controls.Add(this.ShortcutTable);
this.Controls.Add(this.Message);
@@ -249,6 +265,7 @@ private void InitializeComponent()
this.Controls.Add(this.Logo);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.MaximizeBox = false;
this.Name = "Main";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
diff --git a/FlashpointInstaller/src/Forms/Main.cs b/FlashpointInstaller/src/Forms/Main.cs
index c0b7120..0254b4e 100644
--- a/FlashpointInstaller/src/Forms/Main.cs
+++ b/FlashpointInstaller/src/Forms/Main.cs
@@ -40,7 +40,7 @@ private void Main_Load(object sender, EventArgs e)
private void Link_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- Process.Start(new ProcessStartInfo("https://bluemaxima.org/flashpoint") { UseShellExecute = true });
+ Process.Start(new ProcessStartInfo("https://flashpointarchive.org/") { UseShellExecute = true });
}
public void ComponentList_BeforeCheck(object sender, TreeViewCancelEventArgs e)
diff --git a/FlashpointInstaller/src/Forms/Main.resx b/FlashpointInstaller/src/Forms/Main.resx
index a0c80e2..942875c 100644
--- a/FlashpointInstaller/src/Forms/Main.resx
+++ b/FlashpointInstaller/src/Forms/Main.resx
@@ -121,7 +121,7 @@
iVBORw0KGgoAAAANSUhEUgAAAiYAAAC0CAYAAACg/+cnAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wgAADsIBFShKgAAAP3pJREFUeF7tnQd4HNW5/m1MDRAC2N7dmdk+MsUBkjjcQHohIZWSekkhIUB6AULI
+ wQAADsEBuJFr7QAAP3pJREFUeF7tnQd4HNW5/m1MDRAC2N7dmdk+MsUBkjjcQHohIZWSekkhIUB6AULI
DTcVkkByk5Ce8CcJKUDA9GKDGzY2xbhigw3GNBe0uzLF9Grp/77SHPlofGZ2ZnYlrbTf73nexyDtnllp
bc1P3znnO2MEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQRAEQWgrNo3fZ7vO
tJup2G6m6pR29j4sCIIgCIIwPGxwnO2qWTdfddzDICj7VdLuOO9TgiAIgiAIw0PF6ShCTL5SdTqO7xnz
diff --git a/FlashpointManager/FlashpointManager.csproj b/FlashpointManager/FlashpointManager.csproj
index eef4b1c..7301476 100644
--- a/FlashpointManager/FlashpointManager.csproj
+++ b/FlashpointManager/FlashpointManager.csproj
@@ -47,7 +47,8 @@
pdbonly
true
bin\Release\
- TRACE
+
+
prompt
4
false
@@ -304,6 +305,7 @@
Main.cs
+ Designer
ResXFileCodeGenerator
diff --git a/FlashpointManager/Properties/AssemblyInfo.cs b/FlashpointManager/Properties/AssemblyInfo.cs
index dbe0fa0..ca62447 100644
--- a/FlashpointManager/Properties/AssemblyInfo.cs
+++ b/FlashpointManager/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
// 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("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.11")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3")]
diff --git a/FlashpointManager/Properties/app.manifest b/FlashpointManager/Properties/app.manifest
index ef267b2..0ba487c 100644
--- a/FlashpointManager/Properties/app.manifest
+++ b/FlashpointManager/Properties/app.manifest
@@ -47,14 +47,12 @@
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config.
Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
-