From 246ae947b54428dfbe540a3c88132ccba291d515 Mon Sep 17 00:00:00 2001 From: pizzaboxer <41478239+pizzaboxer@users.noreply.github.com> Date: Fri, 26 Aug 2022 16:25:03 +0100 Subject: [PATCH] Add new icon --- Bloxstrap/Dialogs/Preferences.cs | 1 + Bloxstrap/Enums/BootstrapperIcon.cs | 3 ++- Bloxstrap/Helpers/DeployManager.cs | 26 ++++++++++++--------- Bloxstrap/Helpers/IconManager.cs | 2 ++ Bloxstrap/Properties/Resources.Designer.cs | 20 ++++++++++++++++ Bloxstrap/Properties/Resources.resx | 6 +++++ Bloxstrap/Resources/Icon2022-ico.ico | Bin 0 -> 4286 bytes Bloxstrap/Resources/Icon2022-png.png | Bin 0 -> 5968 bytes 8 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 Bloxstrap/Resources/Icon2022-ico.ico create mode 100644 Bloxstrap/Resources/Icon2022-png.png diff --git a/Bloxstrap/Dialogs/Preferences.cs b/Bloxstrap/Dialogs/Preferences.cs index ad67e070..b6f261c6 100644 --- a/Bloxstrap/Dialogs/Preferences.cs +++ b/Bloxstrap/Dialogs/Preferences.cs @@ -32,6 +32,7 @@ public partial class Preferences : Form { "Late 2015", BootstrapperIcon.IconLate2015 }, { "2017", BootstrapperIcon.Icon2017 }, { "2019", BootstrapperIcon.Icon2019 }, + { "2022", BootstrapperIcon.Icon2022 } }; private string ChannelInfo diff --git a/Bloxstrap/Enums/BootstrapperIcon.cs b/Bloxstrap/Enums/BootstrapperIcon.cs index e0444d4c..87ecaf99 100644 --- a/Bloxstrap/Enums/BootstrapperIcon.cs +++ b/Bloxstrap/Enums/BootstrapperIcon.cs @@ -8,6 +8,7 @@ public enum BootstrapperIcon IconEarly2015, IconLate2015, Icon2017, - Icon2019 + Icon2019, + Icon2022 } } diff --git a/Bloxstrap/Helpers/DeployManager.cs b/Bloxstrap/Helpers/DeployManager.cs index dfdbd631..080c90fb 100644 --- a/Bloxstrap/Helpers/DeployManager.cs +++ b/Bloxstrap/Helpers/DeployManager.cs @@ -99,22 +99,21 @@ private static string BuildBaseUrl(string channel) public static async Task GetLastDeploy(string channel) { string baseUrl = BuildBaseUrl(channel); - string deployHistory = ""; string lastDeploy = ""; using (HttpClient client = new()) { - deployHistory = await client.GetStringAsync($"{baseUrl}/DeployHistory.txt"); - } - - using (StringReader reader = new(deployHistory)) - { - string? line; + string deployHistory = await client.GetStringAsync($"{baseUrl}/DeployHistory.txt"); - while ((line = await reader.ReadLineAsync()) is not null) + using (StringReader reader = new(deployHistory)) { - if (line.Contains("WindowsPlayer")) - lastDeploy = line; + string? line; + + while ((line = await reader.ReadLineAsync()) is not null) + { + if (line.Contains("WindowsPlayer")) + lastDeploy = line; + } } } @@ -148,7 +147,12 @@ public static async Task GetLastDeploy(string channel) // convert to traditional version format fileVersion = fileVersion.Replace(" ", "").Replace(',', '.'); - return new VersionDeploy { VersionGuid = versionGuid, Date = date, FileVersion = fileVersion }; + return new VersionDeploy + { + VersionGuid = versionGuid, + Date = date, + FileVersion = fileVersion + }; } } } diff --git a/Bloxstrap/Helpers/IconManager.cs b/Bloxstrap/Helpers/IconManager.cs index 3f873a85..1cd38456 100644 --- a/Bloxstrap/Helpers/IconManager.cs +++ b/Bloxstrap/Helpers/IconManager.cs @@ -19,6 +19,7 @@ public static Icon GetIconResource(BootstrapperIcon icon) case BootstrapperIcon.IconLate2015: return Properties.Resources.IconLate2015_ico; case BootstrapperIcon.Icon2017: return Properties.Resources.Icon2017_ico; case BootstrapperIcon.Icon2019: return Properties.Resources.Icon2019_ico; + case BootstrapperIcon.Icon2022: return Properties.Resources.Icon2022_ico; case BootstrapperIcon.IconBloxstrap: default: return Properties.Resources.IconBloxstrap_ico; } } @@ -38,6 +39,7 @@ public static Bitmap GetBitmapResource(BootstrapperIcon icon) case BootstrapperIcon.IconLate2015: return Properties.Resources.IconLate2015_png; case BootstrapperIcon.Icon2017: return Properties.Resources.Icon2017_png; case BootstrapperIcon.Icon2019: return Properties.Resources.Icon2019_png; + case BootstrapperIcon.Icon2022: return Properties.Resources.Icon2022_png; case BootstrapperIcon.IconBloxstrap: default: return Properties.Resources.IconBloxstrap_png; } } diff --git a/Bloxstrap/Properties/Resources.Designer.cs b/Bloxstrap/Properties/Resources.Designer.cs index a95d9ea6..eb97d68c 100644 --- a/Bloxstrap/Properties/Resources.Designer.cs +++ b/Bloxstrap/Properties/Resources.Designer.cs @@ -180,6 +180,26 @@ internal static System.Drawing.Bitmap Icon2019_png { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon Icon2022_ico { + get { + object obj = ResourceManager.GetObject("Icon2022_ico", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Icon2022_png { + get { + object obj = ResourceManager.GetObject("Icon2022_png", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// diff --git a/Bloxstrap/Properties/Resources.resx b/Bloxstrap/Properties/Resources.resx index 059cfaca..50ed237f 100644 --- a/Bloxstrap/Properties/Resources.resx +++ b/Bloxstrap/Properties/Resources.resx @@ -154,6 +154,12 @@ ..\Resources\Icon2019-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Icon2022-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Icon2022-png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\IconBloxstrap-ico.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Bloxstrap/Resources/Icon2022-ico.ico b/Bloxstrap/Resources/Icon2022-ico.ico new file mode 100644 index 0000000000000000000000000000000000000000..a05eb33d47e0a709469bd29fd91d955bec0c4d9d GIT binary patch literal 4286 zcmc(i4N%kP9mhlM=G@racC+4gIy=w4T)pXw+c!T(^Jj z$N$Mcd7kg*`F?--lTav0_;@;%LjF=}zfYk&MWIlh$9fto6^mRaM-IOBe>jNh6aPcq zjoY_w-F4)(gYRYk^JGnC#xXi-|KMxX|8{b6@(Ty{ryf21?mLB-KRGi{R+u~6Tz(ap z^(9bIlOv^Y%T}ZIrZx1*{=SFx;=Ytu-aL8yuSIzuXNt=Ta@|d3`4K$^wGe0(UwWEI zXRT{A^uPM^yv4n{f1a|2{>Jk;S#?##pW2!$i^A-tTfk~8jbur$#C@VJ$*}n$_nU~L z1$}$(tvAlBq5ni%bA9Uomj=wnThQ513LW(~puMgH+G>k|QS&*pQZZxnk@!!qycT6b z{~wa69eXl2`*aKHuS>*mqqyMIAio{Dnkyp3zFh{arY|Bq%!ZrDgG_aCOw&o~aX=I-^X) zqc-%2fgZKu=ON-#Bscs_M6%0|WLH;uIdt&1zdo2qf77N-$%3wS*&vSrJ)Mnkr=tO@ z9taP=tu~ISdXgTpVKZhQv9_H=f9d>K^ zxK44%=X3oeew`Vo<>jFsRY^BEnA+6pBEb+J9cb`Y@laG z-ro(t0{YW3w zSCoiw3b|k2cQ`D@H?^1{$xX~%$xejX^|5In#C{s&GobcXffy%#=f25!;bw91{&B55 zY?KdxUM2?JNI&SLA|PuLCjE#Adb(O?cI?>ki$wE{M&mZkNdNpwc9ar8YN_%3YR{gR63st+`0!IYmCRx{s=%z4!kBUxOo~A;$|YbJ9l#QU7I`xMcKk%# zd~#3QdgS##9=M$Q@rBWTzE>&cuVg1A*64r1J6aMwVspE0;)q%Z4$6r4Ws>nr7?vh z;+1+3vy)(U0|LyAkG;fO?IqoCFMLs)UluPKKknwR|FPhi0;k0UjtL`7j_bj0)`88W z0V^`uO={4{By(~}pVz8afYYo2n_doMs^O?lV$2S6!>qK@KG0xxYSK^0q(ml?A-kns zftm@wlNA;g?smKE0ngMVxE)rQp0vP}eH>g?^9s|r0bI!DLNJem-f=M|9M$FDYvcq1|lU_n?!X_1R{b^~3_r~u#Hr}~&XR^&Qt_&{vU~YCAylxkG zrkya0JTp#PlxYH{Y=mhn>XQK`&FIsZHtJI%ChR3-BKk;0Wrxu;{A_ny^i^-a8= zz~aI@_~*T_Fy{fEcLwG?ZkU^yiZVH1*7X1;^l6pJh}jtk6ZR7NjAj&E!F***K;t!en3Z33Hpa6Q9hHnsH3P+_W7$E-Scf zX5XNwhmQOH?!9{_&-3!~o>^E}@DhgD5e|nTyu1vdP%y%@6j+2nl*#X#hXwS>H#ZAD z!h}BgaUAr|M{3438FJbtG-ji|Tp^Rb&15p4PfJVtW+LtAwI`iUr!c0S@Jx8HmXT>0 znZn`a)wc!w3)nj|7RTfy-DEJF7K?j#r>CbUKS1xkm$X{##nlBLVh{)f++MGjXS3PP zDHMv|P^r`(-M8o?T;Omx2gu&mI)cIAg3sq0nwpxrhODo#+3cS_!t!7F)~u|o&A7fZ zrXLE0mi>Oe&h2(rS*_N0L?Y1(xCr?z^tBxpi>2J-@pL*Ijt|h&J$P?=qzoSyEHyRt zTaUZOSItL%QvhbMC@CsKCQ>&Mo`9+Y)s`2Bts cf9J&t*P%o!iL4o-BteL>4GSQ=5evot0|n5>RsaA1 literal 0 HcmV?d00001 diff --git a/Bloxstrap/Resources/Icon2022-png.png b/Bloxstrap/Resources/Icon2022-png.png new file mode 100644 index 0000000000000000000000000000000000000000..7f26209da493a6153af416c6625d52a8c16bbc3c GIT binary patch literal 5968 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