From ff5307265387bbcb2405e3ab143c8103a84900c1 Mon Sep 17 00:00:00 2001
From: dot-mike <586280+dot-mike@users.noreply.github.com>
Date: Mon, 10 Feb 2025 23:32:36 +0100
Subject: [PATCH 01/11] Add app.manifest for DPI awareness
---
FlashpointManager/FlashpointManager.csproj | 3 ++-
FlashpointManager/app.manifest | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 FlashpointManager/app.manifest
diff --git a/FlashpointManager/FlashpointManager.csproj b/FlashpointManager/FlashpointManager.csproj
index eef4b1c..48ba141 100644
--- a/FlashpointManager/FlashpointManager.csproj
+++ b/FlashpointManager/FlashpointManager.csproj
@@ -92,7 +92,7 @@
LocalIntranet
- Properties\app.manifest
+ app.manifest
@@ -315,6 +315,7 @@
Resources.resx
True
+
diff --git a/FlashpointManager/app.manifest b/FlashpointManager/app.manifest
new file mode 100644
index 0000000..1fee7cc
--- /dev/null
+++ b/FlashpointManager/app.manifest
@@ -0,0 +1,10 @@
+
+
+
+
+
+ true
+ PerMonitorV2
+
+
+
From 5b6fbd8c60f52da56c2ac5ae071fe811b458b5ac Mon Sep 17 00:00:00 2001
From: dot-mike <586280+dot-mike@users.noreply.github.com>
Date: Mon, 10 Feb 2025 23:33:37 +0100
Subject: [PATCH 02/11] Add new status strip for information. Full width tab
for gui friendliness
---
FlashpointManager/FlashpointManager.csproj | 1 +
FlashpointManager/src/Common.cs | 8 ++
FlashpointManager/src/Forms/Main.Designer.cs | 95 ++++++++++++++------
FlashpointManager/src/Forms/Main.cs | 6 ++
FlashpointManager/src/Forms/Main.resx | 3 +
5 files changed, 87 insertions(+), 26 deletions(-)
diff --git a/FlashpointManager/FlashpointManager.csproj b/FlashpointManager/FlashpointManager.csproj
index 48ba141..29637d7 100644
--- a/FlashpointManager/FlashpointManager.csproj
+++ b/FlashpointManager/FlashpointManager.csproj
@@ -304,6 +304,7 @@
Main.cs
+ Designer
ResXFileCodeGenerator
diff --git a/FlashpointManager/src/Common.cs b/FlashpointManager/src/Common.cs
index 1a0c31d..19ce0e3 100644
--- a/FlashpointManager/src/Common.cs
+++ b/FlashpointManager/src/Common.cs
@@ -463,6 +463,14 @@ public static void SyncManager()
Main.CustomRepo.Checked = true;
break;
}
+
+ long totalInstalledSize = ComponentTracker.Downloaded.Sum(c => c.Size);
+ Main.installSizeLabel.Text = $"Total installed size: {GetFormattedBytes(totalInstalledSize)}";
+ int numInstalled = ComponentTracker.Downloaded.Count;
+ int numMissing = componentList.Count - numInstalled;
+ Main.numInstalledLabel.Text = $"Number of installed components: {numInstalled}";
+ Main.numMissingLabel.Text = $"Number of missing components: {numMissing}";
+
Ready = true;
Main.UpdateList.EndUpdate();
}
diff --git a/FlashpointManager/src/Forms/Main.Designer.cs b/FlashpointManager/src/Forms/Main.Designer.cs
index d1136c4..98259ec 100644
--- a/FlashpointManager/src/Forms/Main.Designer.cs
+++ b/FlashpointManager/src/Forms/Main.Designer.cs
@@ -1,4 +1,6 @@
-namespace FlashpointManager
+using System.Drawing;
+
+namespace FlashpointManager
{
partial class Main
{
@@ -61,13 +63,18 @@ private void InitializeComponent()
this.RepositoryLabel = new System.Windows.Forms.Label();
this.CustomRepo = new System.Windows.Forms.RadioButton();
this.UninstallButton = new System.Windows.Forms.Button();
- this.OfflineIndicator = new System.Windows.Forms.Label();
+ this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+ this.OfflineIndicator = new System.Windows.Forms.ToolStripStatusLabel();
+ this.installSizeLabel = new System.Windows.Forms.ToolStripStatusLabel();
+ this.numInstalledLabel = new System.Windows.Forms.ToolStripStatusLabel();
+ this.numMissingLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.TabControl.SuspendLayout();
this.ManageTab.SuspendLayout();
this.DescriptionBox.SuspendLayout();
this.UpdateTab.SuspendLayout();
this.groupBox1.SuspendLayout();
this.SettingsTab.SuspendLayout();
+ this.statusStrip1.SuspendLayout();
this.SuspendLayout();
//
// TabControl
@@ -75,10 +82,11 @@ private void InitializeComponent()
this.TabControl.Controls.Add(this.ManageTab);
this.TabControl.Controls.Add(this.UpdateTab);
this.TabControl.Controls.Add(this.SettingsTab);
- this.TabControl.ItemSize = new System.Drawing.Size(150, 20);
+ this.TabControl.ItemSize = new System.Drawing.Size(200, 50);
this.TabControl.Location = new System.Drawing.Point(20, 15);
this.TabControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.TabControl.Name = "TabControl";
+ this.TabControl.Padding = new System.Drawing.Point(10, 10);
this.TabControl.SelectedIndex = 0;
this.TabControl.Size = new System.Drawing.Size(916, 435);
this.TabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
@@ -91,11 +99,11 @@ private void InitializeComponent()
this.ManageTab.Controls.Add(this.ChangeButton);
this.ManageTab.Controls.Add(this.DescriptionBox);
this.ManageTab.Controls.Add(this.ComponentList);
- this.ManageTab.Location = new System.Drawing.Point(4, 24);
+ this.ManageTab.Location = new System.Drawing.Point(4, 54);
this.ManageTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ManageTab.Name = "ManageTab";
this.ManageTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.ManageTab.Size = new System.Drawing.Size(908, 407);
+ this.ManageTab.Size = new System.Drawing.Size(908, 377);
this.ManageTab.TabIndex = 1;
this.ManageTab.Text = "Add/Remove Components";
this.ManageTab.UseVisualStyleBackColor = true;
@@ -121,10 +129,10 @@ private void InitializeComponent()
// ChangeButton
//
this.ChangeButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.ChangeButton.Location = new System.Drawing.Point(20, 337);
+ this.ChangeButton.Location = new System.Drawing.Point(14, 323);
this.ChangeButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChangeButton.Name = "ChangeButton";
- this.ChangeButton.Size = new System.Drawing.Size(861, 40);
+ this.ChangeButton.Size = new System.Drawing.Size(857, 40);
this.ChangeButton.TabIndex = 4;
this.ChangeButton.Text = "&Apply changes";
this.ChangeButton.UseVisualStyleBackColor = true;
@@ -158,7 +166,7 @@ private void InitializeComponent()
this.ComponentList.Location = new System.Drawing.Point(14, 18);
this.ComponentList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ComponentList.Name = "ComponentList";
- this.ComponentList.Size = new System.Drawing.Size(584, 232);
+ this.ComponentList.Size = new System.Drawing.Size(584, 295);
this.ComponentList.TabIndex = 0;
this.ComponentList.TriStateStyleProperty = RikTheVeggie.TriStateTreeView.TriStateStyles.Installer;
this.ComponentList.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.ComponentList_AfterCheck);
@@ -170,11 +178,11 @@ private void InitializeComponent()
this.UpdateTab.Controls.Add(this.groupBox1);
this.UpdateTab.Controls.Add(this.UpdateButton);
this.UpdateTab.Controls.Add(this.UpdateList);
- this.UpdateTab.Location = new System.Drawing.Point(4, 24);
+ this.UpdateTab.Location = new System.Drawing.Point(4, 54);
this.UpdateTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.UpdateTab.Name = "UpdateTab";
this.UpdateTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.UpdateTab.Size = new System.Drawing.Size(908, 407);
+ this.UpdateTab.Size = new System.Drawing.Size(908, 377);
this.UpdateTab.TabIndex = 3;
this.UpdateTab.Text = "Update Components";
this.UpdateTab.UseVisualStyleBackColor = true;
@@ -290,18 +298,19 @@ private void InitializeComponent()
this.SettingsTab.Controls.Add(this.RepositoryLabel);
this.SettingsTab.Controls.Add(this.CustomRepo);
this.SettingsTab.Controls.Add(this.UninstallButton);
- this.SettingsTab.Location = new System.Drawing.Point(4, 24);
+ this.SettingsTab.Location = new System.Drawing.Point(4, 54);
this.SettingsTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.SettingsTab.Name = "SettingsTab";
this.SettingsTab.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.SettingsTab.Size = new System.Drawing.Size(908, 407);
+ this.SettingsTab.Size = new System.Drawing.Size(908, 377);
this.SettingsTab.TabIndex = 2;
this.SettingsTab.Text = "Settings";
this.SettingsTab.UseVisualStyleBackColor = true;
//
// SaveButton
//
- this.SaveButton.Location = new System.Drawing.Point(74, 271);
+ this.SaveButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+ this.SaveButton.Location = new System.Drawing.Point(82, 308);
this.SaveButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.SaveButton.Name = "SaveButton";
this.SaveButton.Size = new System.Drawing.Size(240, 40);
@@ -342,7 +351,7 @@ private void InitializeComponent()
// CheckFilesButton
//
this.CheckFilesButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.CheckFilesButton.Location = new System.Drawing.Point(330, 337);
+ this.CheckFilesButton.Location = new System.Drawing.Point(330, 308);
this.CheckFilesButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.CheckFilesButton.Name = "CheckFilesButton";
this.CheckFilesButton.Size = new System.Drawing.Size(240, 40);
@@ -411,7 +420,7 @@ private void InitializeComponent()
// UninstallButton
//
this.UninstallButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.UninstallButton.Location = new System.Drawing.Point(580, 337);
+ this.UninstallButton.Location = new System.Drawing.Point(580, 308);
this.UninstallButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.UninstallButton.Name = "UninstallButton";
this.UninstallButton.Size = new System.Drawing.Size(240, 40);
@@ -420,24 +429,52 @@ private void InitializeComponent()
this.UninstallButton.UseVisualStyleBackColor = true;
this.UninstallButton.Click += new System.EventHandler(this.UninstallButton_Click);
//
+ // statusStrip1
+ //
+ this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
+ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.OfflineIndicator,
+ this.installSizeLabel,
+ this.numInstalledLabel,
+ this.numMissingLabel});
+ this.statusStrip1.Location = new System.Drawing.Point(0, 463);
+ this.statusStrip1.Name = "statusStrip1";
+ this.statusStrip1.Size = new System.Drawing.Size(949, 32);
+ this.statusStrip1.TabIndex = 2;
+ this.statusStrip1.Text = "statusStrip1";
+ //
// OfflineIndicator
//
- this.OfflineIndicator.AutoSize = true;
- this.OfflineIndicator.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.OfflineIndicator.Location = new System.Drawing.Point(795, 25);
- this.OfflineIndicator.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.OfflineIndicator.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.OfflineIndicator.Name = "OfflineIndicator";
- this.OfflineIndicator.Size = new System.Drawing.Size(116, 20);
- this.OfflineIndicator.TabIndex = 1;
+ this.OfflineIndicator.Size = new System.Drawing.Size(125, 25);
this.OfflineIndicator.Text = "Offline Mode";
this.OfflineIndicator.Visible = false;
//
+ // installSizeLabel
+ //
+ this.installSizeLabel.Name = "installSizeLabel";
+ this.installSizeLabel.Size = new System.Drawing.Size(88, 25);
+ this.installSizeLabel.Text = "installSize";
+ //
+ // numInstalledLabel
+ //
+ this.numInstalledLabel.Name = "numInstalledLabel";
+ this.numInstalledLabel.Size = new System.Drawing.Size(155, 25);
+ this.numInstalledLabel.Text = "numInstalledLabel";
+ //
+ // numMissingLabel
+ //
+ this.numMissingLabel.Name = "numMissingLabel";
+ this.numMissingLabel.Size = new System.Drawing.Size(150, 25);
+ this.numMissingLabel.Text = "numMissingLabel";
+ //
// Main
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(949, 464);
- this.Controls.Add(this.OfflineIndicator);
+ this.ClientSize = new System.Drawing.Size(949, 495);
+ this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.TabControl);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -457,13 +494,14 @@ private void InitializeComponent()
this.groupBox1.PerformLayout();
this.SettingsTab.ResumeLayout(false);
this.SettingsTab.PerformLayout();
+ this.statusStrip1.ResumeLayout(false);
+ this.statusStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
- private System.Windows.Forms.TabControl TabControl;
private System.Windows.Forms.TabPage ManageTab;
private System.Windows.Forms.TabPage SettingsTab;
public RikTheVeggie.TriStateTreeView ComponentList;
@@ -484,17 +522,22 @@ private void InitializeComponent()
private System.Windows.Forms.Button BrowseButton;
private System.Windows.Forms.Label LocationLabel;
public System.Windows.Forms.Button CheckFilesButton;
- private System.Windows.Forms.Button SaveButton;
public System.Windows.Forms.TextBox RepositoryBox;
public System.Windows.Forms.TextBox LocationBox;
public System.Windows.Forms.RadioButton StableRepo;
public System.Windows.Forms.RadioButton DevRepo;
public System.Windows.Forms.RadioButton CustomRepo;
- private System.Windows.Forms.Label OfflineIndicator;
private System.Windows.Forms.GroupBox groupBox1;
public System.Windows.Forms.Label lblTotalUpdates;
public System.Windows.Forms.Label lblTotalUpdatesSize;
private System.Windows.Forms.CheckBox chkUncheckAll;
+ public System.Windows.Forms.Button SaveButton;
+ private System.Windows.Forms.StatusStrip statusStrip1;
+ private System.Windows.Forms.ToolStripStatusLabel OfflineIndicator;
+ public System.Windows.Forms.ToolStripStatusLabel installSizeLabel;
+ public System.Windows.Forms.ToolStripStatusLabel numInstalledLabel;
+ public System.Windows.Forms.ToolStripStatusLabel numMissingLabel;
+ private System.Windows.Forms.TabControl TabControl;
}
}
diff --git a/FlashpointManager/src/Forms/Main.cs b/FlashpointManager/src/Forms/Main.cs
index 64e8d23..c87f3f9 100644
--- a/FlashpointManager/src/Forms/Main.cs
+++ b/FlashpointManager/src/Forms/Main.cs
@@ -17,6 +17,7 @@ public partial class Main : Form
private void Main_Load(object sender, EventArgs e)
{
+ this.TabControl.ItemSize = new Size(this.TabControl.Width / this.TabControl.TabCount, 0) - new Size(1, 0);
Text += $" v{Application.ProductVersion}";
if (FPM.OfflineMode)
@@ -190,5 +191,10 @@ private void chkUncheckAll_CheckedChanged(object sender, EventArgs e)
ChangeButton.Focus();
}
+
+ private void OfflineIndicator_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
diff --git a/FlashpointManager/src/Forms/Main.resx b/FlashpointManager/src/Forms/Main.resx
index 64225fa..bb9316a 100644
--- a/FlashpointManager/src/Forms/Main.resx
+++ b/FlashpointManager/src/Forms/Main.resx
@@ -117,6 +117,9 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
From 310e7dc69c4c6246d18ee7608080ccf96eeb987a Mon Sep 17 00:00:00 2001
From: dot-mike <586280+dot-mike@users.noreply.github.com>
Date: Mon, 10 Feb 2025 23:57:20 +0100
Subject: [PATCH 03/11] Update repo url to nexus-dev.flashpointarchive.org
---
FlashpointManager/src/Common.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/FlashpointManager/src/Common.cs b/FlashpointManager/src/Common.cs
index 19ce0e3..e9b9637 100644
--- a/FlashpointManager/src/Common.cs
+++ b/FlashpointManager/src/Common.cs
@@ -176,8 +176,8 @@ public static class FPM
// Internet locations of component list XMLs
public static class RepoXmlTemplates
{
- public const string Stable = "https://nexus-dev.unstable.life/repository/stable/components.xml";
- public const string Development = "https://nexus-dev.unstable.life/repository/development/components.xml";
+ public const string Stable = "https://nexus-dev.flashpointarchive.org/repository/stable/components.xml";
+ public const string Development = "https://nexus-dev.flashpointarchive.org/repository/development/components.xml";
}
public static string RepoXml { get; set; } = RepoXmlTemplates.Stable;
// Path to the local Flashpoint copy
From a20895f0ab46daa5f666df5d9fb126765e24879e Mon Sep 17 00:00:00 2001
From: dot-mike <586280+dot-mike@users.noreply.github.com>
Date: Tue, 11 Feb 2025 00:00:53 +0100
Subject: [PATCH 04/11] Update repo url to nexus-dev.flashpointarchive.org for
installer
---
FlashpointInstaller/src/Common.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
From 5f203d15a20e40d895582ebfad1ff31527bfdd3d Mon Sep 17 00:00:00 2001
From: dot-mike <586280+dot-mike@users.noreply.github.com>
Date: Tue, 11 Feb 2025 00:01:21 +0100
Subject: [PATCH 05/11] flashpointarchive.org is our offical url. Replace blue
domain
---
.../FlashpointInstaller.csproj | 1 +
.../src/Forms/Main.Designer.cs | 95 +++++++++++--------
FlashpointInstaller/src/Forms/Main.cs | 2 +-
FlashpointInstaller/src/Forms/Main.resx | 2 +-
4 files changed, 59 insertions(+), 41 deletions(-)
diff --git a/FlashpointInstaller/FlashpointInstaller.csproj b/FlashpointInstaller/FlashpointInstaller.csproj
index 30d88fe..dc76deb 100644
--- a/FlashpointInstaller/FlashpointInstaller.csproj
+++ b/FlashpointInstaller/FlashpointInstaller.csproj
@@ -297,6 +297,7 @@
Main.cs
+ Designer
ResXFileCodeGenerator
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
From 9e3d4f4a6d10eb30eabc67dadfff75e51176e5d4 Mon Sep 17 00:00:00 2001
From: dot-mike <586280+dot-mike@users.noreply.github.com>
Date: Tue, 11 Feb 2025 17:08:55 +0100
Subject: [PATCH 06/11] Re-use existing manifest for DPIawareness.
---
FlashpointManager/FlashpointManager.csproj | 3 +--
FlashpointManager/Properties/app.manifest | 4 +---
FlashpointManager/app.manifest | 10 ----------
3 files changed, 2 insertions(+), 15 deletions(-)
delete mode 100644 FlashpointManager/app.manifest
diff --git a/FlashpointManager/FlashpointManager.csproj b/FlashpointManager/FlashpointManager.csproj
index 29637d7..084228c 100644
--- a/FlashpointManager/FlashpointManager.csproj
+++ b/FlashpointManager/FlashpointManager.csproj
@@ -92,7 +92,7 @@
LocalIntranet
- app.manifest
+ Properties\app.manifest
@@ -316,7 +316,6 @@
Resources.resx
True
-
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 -->
-