Skip to content

Commit

Permalink
Fix 2011/2015 icons (and other stuff)
Browse files Browse the repository at this point in the history
 - Fix transparency issues with 2011 and 2015 icons
 - Renamed Late 2015 to 2016 (sake of simplicity, minor technicality, besides everyone basically knows it as the 2016 icon)
  • Loading branch information
pizzaboxer committed Aug 27, 2022
1 parent 8316c9e commit 427485f
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 20 deletions.
1 change: 0 additions & 1 deletion Bloxstrap/Bloxstrap.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
<Version>1.4.1</Version>
<FileVersion>1.4.1.0</FileVersion>
<UseWPF>True</UseWPF>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Bloxstrap/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
24 changes: 17 additions & 7 deletions Bloxstrap/Dialogs/Preferences.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Bloxstrap/Dialogs/Preferences.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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
{
Expand All @@ -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()
Expand Down
6 changes: 1 addition & 5 deletions Bloxstrap/Helpers/DeployManager.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System.Globalization;
using System.IO;
using System.Net.Http;

using Bloxstrap.Models;
using Bloxstrap.Models;

namespace Bloxstrap.Helpers
{
Expand Down
Binary file modified Bloxstrap/Resources/Icon2011-png.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bloxstrap/Resources/IconEarly2015-png.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 427485f

Please sign in to comment.