diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj
index 75d41f5e..0f97dbb3 100644
--- a/Bloxstrap/Bloxstrap.csproj
+++ b/Bloxstrap/Bloxstrap.csproj
@@ -11,7 +11,6 @@
Bloxstrap.ico
1.4.1
1.4.1.0
- True
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index c35a2e62..df19c1ad 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -634,7 +634,7 @@ private void ExtractPackage(Package package)
if (CancelFired)
return;
- if (entry.FullName.EndsWith(@"\"))
+ if (entry.FullName.EndsWith('\\'))
continue;
extractPath = Path.Combine(packageFolder, entry.FullName);
diff --git a/Bloxstrap/Dialogs/Preferences.Designer.cs b/Bloxstrap/Dialogs/Preferences.Designer.cs
index e50619f8..a2100b6e 100644
--- a/Bloxstrap/Dialogs/Preferences.Designer.cs
+++ b/Bloxstrap/Dialogs/Preferences.Designer.cs
@@ -64,6 +64,7 @@ private void InitializeComponent()
this.PreviewButton = new System.Windows.Forms.Button();
this.InstallLocationBrowseDialog = new System.Windows.Forms.FolderBrowserDialog();
this.InfoTooltip = new System.Windows.Forms.ToolTip(this.components);
+ this.label2 = new System.Windows.Forms.Label();
this.Tabs.SuspendLayout();
this.DialogTab.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -92,7 +93,7 @@ private void InitializeComponent()
//
this.Tabs.Controls.Add(this.DialogTab);
this.Tabs.Controls.Add(this.InstallationTab);
- this.Tabs.Location = new System.Drawing.Point(12, 40);
+ this.Tabs.Location = new System.Drawing.Point(12, 62);
this.Tabs.Name = "Tabs";
this.Tabs.SelectedIndex = 0;
this.Tabs.Size = new System.Drawing.Size(442, 247);
@@ -142,8 +143,7 @@ private void InitializeComponent()
// ToggleRFUAutoclose
//
this.ToggleRFUAutoclose.AutoSize = true;
- this.ToggleRFUAutoclose.Checked = true;
- this.ToggleRFUAutoclose.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.ToggleRFUAutoclose.Enabled = false;
this.ToggleRFUAutoclose.Location = new System.Drawing.Point(9, 40);
this.ToggleRFUAutoclose.Name = "ToggleRFUAutoclose";
this.ToggleRFUAutoclose.Size = new System.Drawing.Size(209, 19);
@@ -156,8 +156,6 @@ private void InitializeComponent()
// ToggleRFUEnabled
//
this.ToggleRFUEnabled.AutoSize = true;
- this.ToggleRFUEnabled.Checked = true;
- this.ToggleRFUEnabled.CheckState = System.Windows.Forms.CheckState.Checked;
this.ToggleRFUEnabled.Location = new System.Drawing.Point(9, 19);
this.ToggleRFUEnabled.Name = "ToggleRFUEnabled";
this.ToggleRFUEnabled.Size = new System.Drawing.Size(127, 19);
@@ -436,7 +434,7 @@ private void InitializeComponent()
this.panel1.Controls.Add(this.ToggleCheckForUpdates);
this.panel1.Controls.Add(this.PreviewButton);
this.panel1.Controls.Add(this.SaveButton);
- this.panel1.Location = new System.Drawing.Point(-1, 298);
+ this.panel1.Location = new System.Drawing.Point(-1, 320);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(466, 42);
this.panel1.TabIndex = 6;
@@ -475,12 +473,22 @@ private void InitializeComponent()
this.InfoTooltip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
this.InfoTooltip.ToolTipTitle = "Information";
//
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(9, 35);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(234, 15);
+ this.label2.TabIndex = 7;
+ this.label2.Text = "Hover over an option for more information";
+ //
// Preferences
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
- this.ClientSize = new System.Drawing.Size(464, 339);
+ this.ClientSize = new System.Drawing.Size(464, 361);
+ this.Controls.Add(this.label2);
this.Controls.Add(this.panel1);
this.Controls.Add(this.Tabs);
this.Controls.Add(this.label1);
@@ -510,6 +518,7 @@ private void InitializeComponent()
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -549,5 +558,6 @@ private void InitializeComponent()
private ComboBox SelectChannel;
private Label LabelChannelInfo;
private CheckBox ToggleShowAllChannels;
+ private Label label2;
}
}
\ No newline at end of file
diff --git a/Bloxstrap/Dialogs/Preferences.cs b/Bloxstrap/Dialogs/Preferences.cs
index 535ef979..1e9d8ab7 100644
--- a/Bloxstrap/Dialogs/Preferences.cs
+++ b/Bloxstrap/Dialogs/Preferences.cs
@@ -27,8 +27,8 @@ public partial class Preferences : Form
{ "Bloxstrap", BootstrapperIcon.IconBloxstrap },
{ "2009", BootstrapperIcon.Icon2009 },
{ "2011", BootstrapperIcon.Icon2011 },
- { "Early 2015", BootstrapperIcon.IconEarly2015 },
- { "Late 2015", BootstrapperIcon.IconLate2015 },
+ { "2015", BootstrapperIcon.IconEarly2015 },
+ { "2016", BootstrapperIcon.IconLate2015 },
{ "2017", BootstrapperIcon.Icon2017 },
{ "2019", BootstrapperIcon.Icon2019 },
{ "2022", BootstrapperIcon.Icon2022 }
@@ -40,7 +40,7 @@ private string ChannelInfo
{
if (this.InvokeRequired)
{
- this.Invoke(new Action(() => { this.LabelChannelInfo.Text = value; }));
+ this.Invoke(() => this.LabelChannelInfo.Text = value);
}
else
{
@@ -53,16 +53,16 @@ private string ChannelInfo
#region Core
private async Task GetChannelInfo(string channel)
{
- ChannelInfo = "Getting latest deploy, please wait...";
+ ChannelInfo = "Getting latest version, please wait...";
VersionDeploy info = await DeployManager.GetLastDeploy(channel);
if (info.FileVersion is null || info.Timestamp is null)
return;
- string strTimestamp = info.Timestamp.Value.ToString("MM/dd/yyyy hh:mm:ss tt", Program.CultureFormat);
+ string strTimestamp = info.Timestamp.Value.ToString("MM/dd/yyyy h:mm:ss tt", Program.CultureFormat);
- ChannelInfo = $"Last deploy:\nv{info.FileVersion} @ {strTimestamp}";
+ ChannelInfo = $"Latest version:\nv{info.FileVersion} @ {strTimestamp}";
}
public Preferences()
diff --git a/Bloxstrap/Helpers/DeployManager.cs b/Bloxstrap/Helpers/DeployManager.cs
index 648e12b3..54d291c5 100644
--- a/Bloxstrap/Helpers/DeployManager.cs
+++ b/Bloxstrap/Helpers/DeployManager.cs
@@ -1,8 +1,4 @@
-using System.Globalization;
-using System.IO;
-using System.Net.Http;
-
-using Bloxstrap.Models;
+using Bloxstrap.Models;
namespace Bloxstrap.Helpers
{
diff --git a/Bloxstrap/Resources/Icon2011-png.png b/Bloxstrap/Resources/Icon2011-png.png
index 0b1d0f34..d28f26a8 100644
Binary files a/Bloxstrap/Resources/Icon2011-png.png and b/Bloxstrap/Resources/Icon2011-png.png differ
diff --git a/Bloxstrap/Resources/IconEarly2015-png.png b/Bloxstrap/Resources/IconEarly2015-png.png
index 0e662509..1de7759b 100644
Binary files a/Bloxstrap/Resources/IconEarly2015-png.png and b/Bloxstrap/Resources/IconEarly2015-png.png differ