From 2d41d48719e531f756a0cb005579e8327f32bd22 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Tue, 11 Jun 2024 23:49:45 +0100
Subject: [PATCH] Make progress style cancel button translatable

---
 Bloxstrap/Resources/CancelButton.png          | Bin 768 -> 229 bytes
 Bloxstrap/Resources/CancelButtonHover.png     | Bin 944 -> 394 bytes
 Bloxstrap/Resources/DarkCancelButton.png      | Bin 1134 -> 229 bytes
 Bloxstrap/Resources/DarkCancelButtonHover.png | Bin 1175 -> 394 bytes
 .../Bootstrapper/ProgressDialog.Designer.cs   |  39 +++++++++---------
 .../Elements/Bootstrapper/ProgressDialog.cs   |   2 +
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Bloxstrap/Resources/CancelButton.png b/Bloxstrap/Resources/CancelButton.png
index 966103bffc2c603505d9fd9baca2e57141ce9754..e9eff11dc66cc001ceab7cdc9a867d4c267b1f8b 100644
GIT binary patch
delta 185
zcmZo*d&)RLf|G@rfq@~~x;9{<qC&k~fKQ0)|NsC0{{4IX`t`kg_wLxS<II^eKYskU
zdGqGkvuD45|1PubtSe9lXMsm#F#`j)00=X#Ro+_)6b$fmaSZV|o-Dz7g}LXH-V-Ke
z#toc4i7C<Zq8OIV5I$knc$UFu<AhuW=H|mII2Wt+%reM21ZEfrYpk!Fse0>#St8q#
jZ_D?v8gZ>)kdR;~s?sVst}2`XG@QZH)z4*}Q$iB}Kq*SU

delta 728
zcmaFL*uXYHf|G-dfq`MAXhQNtMTL6K0*}aI1_o|H5N51TiJ!>8z%<p<#WAEJ?(H1K
z{#OnnZujTAJ-(QsBgV<psG4BFqQck7<oxXI&WFn7vxVgRzkEGgr#>_1rO$2O{l?{|
z@*ad6KI86AV1l8hFu`}<t8c#lp1Lz;+RvJIVUEh)Myj{XqFf&|oUKm_&f9)Fx&P;V
zMQ<Zp8NPno`<bGQ)jE!~6EtsbyQsyq^vIQyt8;V@@gG*2aR42a9C=!#x%%p=IeyEJ
z&#McZ%JHW)XK&o}lPN;E8zWp8Y8e>WnjKGEa9<_(u*Pos#S9ViY8yHG?d^vX^;0%*
z$U6SGQ~x5Ss{eR$e%>C}7YwTo&cBm#WP*XowEh^~2(Pl;v474af3m-IW8T@c^L1MM
z*V)e<t@!G@{POdSVhfpf?7Wl0`iaYFv0>bCfoUfcm6&UDKHpJP5jwtk{%1x0#?5Dg
zj$}*So+GT|#IA9r{K-sS7T<`b3mnGboaeM7Iks!ICCJy-S7u(SSeGqm<)CEJoY!2y
zG3|h5o0@>5am0o7wNXa5)-8T@@cp7?sw|v9Q!>mx@qFMq6db9pa7;_%qhHIjA3Vt~
zPAjblOa#gnEG|xvoLbqG?lY}5plHK;mkU2){<Z%4v}w{t4%vm9d^@l4T+vaj>2wHP
zFyEoVE@6I!dQ(gNWy_4J<rm*9W_r0xK~Um8FsK++oby^dG)!3il?^(T?sYO$F@!vh
zbms5>@-+KGgr7qE|GT?q*E@zPF>Ia~>7j8}dR^qIOXqIHJd?a{)Ald?`Nf>`7mgd|
zUVm<S++bOLh<ejcYn>)eG-M}qP`+ucu#wB(7tR}Mbn15BjcV)K5x0KgOLzJ1@8YRf
ruAlhySpSrPJwGfN0n^hyji=`9wcKs`Qy8uTlQ4s)tDnm{r-UW|JYPWv

diff --git a/Bloxstrap/Resources/CancelButtonHover.png b/Bloxstrap/Resources/CancelButtonHover.png
index 80b79a442824944197f0ea680ab954e0e873078c..1a56f458974532649eedfc110887337d645bd3ed 100644
GIT binary patch
delta 350
zcmV-k0iph|2Z{rb83+Ra005rLkWrB#Ab(d-OjJex|Ns5{{rdX)`1ttu_xJYp_Wb<(
z_4W18(9pZPySTWx&d$!v%*^}y`|t1Xy1KgQ>FMg~>gML=<>lqW!^6$Z&BVmS+uPf~
zz`(h=x!l~`($dn)%gY*mb65ZX010qNS#tmY3lIPR3lIUVBfWJ1006v6L_t(oM}O_u
zOA>=141i$};;V>=rS;MKpR;BrFw+YJXPR%7oj>jpCBzTi7z@m-X*7NQ(sunYvK#uY
zr2wVj;S9};jO!u)hsn<s3a*CPPk9U@P0Yq6Ki$S!3DMF7YpsM8Xp#gZ2}lx<Bp^vZ
zl7J)uNdl4tBne0okR+fRB-mJMtxGKnoe9rWp~0qCS!*Z%-gde>Fxt1HEcY6g<4o?u
w%BAyI%85g@;6q%Q#o(bFdhT%U`g2Ns0Vt^~>I&ym4gdfE07*qoM6N<$g61T*QUCw|

delta 904
zcmV;319$w21F#2>83+ad005~KU}KRXAb$yPNLh0L01FWS01FWTe`H^g0009;Nkl<Z
zcwX(CJx}966h-$>r>0L$ot8Ewfd&Ls0tit86;hC(K@|B=J~VJfd(n#tYjz8-Gu$IR
zVLW3S`5w<0OZKm1%sUprWGsToSOk;VD#CibPK(7N&FAwpo6XX6I(6-Eks(=<DSz2+
z<C6%h)hbOUlXQK3osN%>)8XNvtAHX)G9_CwuCgHlwqVfJ)m6H<xX2cnG9XJbMFuji
zjtm<jESJml^74|7j*curfsiTLk}+9FHbkJ~)6-KPN=%uM?ep{Vrwe^U1a2xGA0I73
z!H_K(lXYZ61m=$Mcx(|0hHS~0tbZdG;fG-nOvWOZj72aRi(oPqp&?#hU(@O7X?l2g
z_`RlG6eR)=Lx#g)>h*fL27^Hkpba2Er_;$Yw2@*&;K^sV+s!9?e}DgDd2es86*5?a
zh9G=SbR2qbZ*N<3;w?f0FdBU4BqN4|p_o46Xu(u+b90k_#y;`+JInok|9_*Mk%!|0
z`=Y<v4h{}JwzUWiz{%w#E0C`sG>ZP(hOk5o5gBM>nfneQk=UN~><@VeoMomWey3Pw
zpI{LhK%v$VuWTS_!V-i=m~oU~zmkP;t6~V&(H5sB_2;-2p#da9HRx>+4#5&Q+fV`#
zbOj6AwN6vUw&Q5@;BQfB3V%TYi_ieN8o3Af3c}N{PC)ckP@+zRYX1m*Xp17K7-1|z
z18|~aU=a=T1W%tR3!%hd>qJohIQ$E>#c3sC5gJ0nHbb<oKwYJTFA*3OXeSWv4_GJa
zM38XW2c`css%?xwIxa{A`nQo{L;%SUix3HgQt%XkNfc2h0_X-%#ecnqZXRii$Do)_
zARfQ&znlL-Q6d0WBUd4zR8P3BQVs3&jl(?stJ~22)qZrfM`&Z4ZO7+#wxLhkC{6_P
zZ&(DAu?Qw(5lqG+n2bd*8H->t-x5Kuy!j>AG9gp4t$pQ<jyw!GJ3C94mzS2IAPAmJ
z&(F{6UxL+Z@ppH3>2>7fBtOb!C~@t6ktLbl-{0527OxLwU<@1Z_!Nuyz`|%Wa_wM|
z9T}1(nUXCT|M5c^z-LwHh&4<T%qQGjxOTV5kSxiRY->NABe2CE(<-OPkSzb|V_N2C
eViC+cDZK$M2WrRFwn2da0000<MNUMnLSTabvymVG

diff --git a/Bloxstrap/Resources/DarkCancelButton.png b/Bloxstrap/Resources/DarkCancelButton.png
index 4a75277616bda582438a1b4e58d1a23dfc124252..3d6331ba8a99de1c6910874cbf94cd622b84e1e6 100644
GIT binary patch
delta 185
zcmaFI@sx3b1SbnK0|P^}b#1^zMTL5~0G|+7Wo2bmRaI|q@6^=PtgNiCurMtxEl*F+
z(9lqAZEZE}r+GjfoCO|{#S9GG{2<IY=_m72pkRQfi(`n#@ni|sE6hEo^qw#&Gj8DY
zNlb~J7saq_hVTiq#<L7Q8z<y4FgG7w!MRwiXO=<MAuz*0SYv(VOx0T_%o5p_d|SSU
f)re~agM<V_QI%H7aaG|Apy3Rju6{1-oD!M<MM60w

delta 1097
zcmV-P1h)I-0qzKp7zqdl0001~6<}kLAs~MVa7bBm000id000id0mpBsWB>pJ14%?d
zRCr$Pn`=)KK@^7lFUI&MynWGN;{8HY#Gq&d@qUe>Mo@_tP!TnXQoKeGr3eDrivF~*
z&w<lS*J){2W4rZyc+&37+1X~^ch8*N?k-unY`HTGGlC(Q5e&hMU<hUeLnzA#>l%O7
zyQ|l_-20JHH}~U*kpR#N&Co8SX_Q5cz+fN7#$3nIV{XN&HNhC8_CPB%LpwAK#rTvo
z!oZ`)?pk+uu+K;iXo!}fKBcG;aFLmyen87onIUKd))i7psLx0)Xj-gh2pR$Bu)c))
zjO2o*#j--s2vnR_7}g(XingJ?pb>w#{0Oxh$)}jMW`zF?GlC(Q5e&hMP-V95Xmm}@
z``pUa)h)skYlID(wzx-+pSa1XFK%XLR(Sd9wL5gUEf`;`ynXvFH?KckTYE>a|6h?v
zBXnNA;^yY~6Xj=+7elGwezk}hAto0uT`mxu%s~6vbq(&$-Ci*WlUwanTP}ZQgqVDu
zoRW!SSqSy-Z#`IGf?a#|x~I<u^UDV?`Lz4{4W&}j#~n5dmdR#aHv8R;jE=hPI~xmP
z;bzY*S(f-M#D>P?w|x9GF5>{-Y4c;u2r)Q)=B!NGw@jw&GhQ>u*KZjS8qsvy7gz<M
z9npwo8xYVRGnE>i@5^N$;@E#jw_6UhN({GcW%<g1nHWQ3e9_GaF}QX6j!YVp7wRuY
z^S+jXZJqr7hXcR0A()y>#6-LtRQ9y_#_}@&zwO4&p8U3EF8{xouI}s7=HJdWBg6pV
zn6yfbKplaA2*u~6&Rnq>8Ak;{EPr1;lT|2<qhR&pe2686Oc3qU<wSqYW=4ns>o=3e
z*%s;#(Rc6ue2UKPH#_?^zcfHOMu-ZfXL>2&^vo|s)L3SO3fQ=LYhG09g;0!NJCM$a
zji&MACr(Lw93ya+mpVRZEki87A%tawKSY-Y#EsrOLhKJ?AKl>d7qWfg<Y|fZ1qZng
z5os^i2zPt?WE+uv({X?7bLTI}ciJgvF>UmUqy5Oyf^9RxAE1*5>GXtq_4>{HTE37i
z#?xsLBcDNXaF2mA@&1GU{PGaT2#h;1@mboYr)T6cmOGkUX>c69Jk;fZc8*DXqGP3o
zUltv|S|rj4z;%57vTXqbe$fB0;7sN07m*fX5D!uK9>)m4%`1PzSK|Tohh_wY<M=fR
zupj$tj2YoCp?})&8R}Pd?QU8$rcy9mxySbFf?6c;Mlk*kW&}g1$O!iEYJF1i!>jf<
zdwo*z<Lvf=OMO!D3od|j?3K6rA=WEzioFC|AE06EmtYlKL`q?Ou>vwVpcR^-U8zi<
zENTQ`U12aPPA)Y+jM@jS(5zTZ5Tz_581;`C!4S*{hG0f81T%t>W4ZeU$t>oYO`>wc
P00000NkvXXu0mjfHvAa2

diff --git a/Bloxstrap/Resources/DarkCancelButtonHover.png b/Bloxstrap/Resources/DarkCancelButtonHover.png
index 4686f0d795ea1e40d1d0f709ba6801f6ff58c704..522c1b11e90d8acd1e5697aac8e1b525b98d5e62 100644
GIT binary patch
delta 350
zcmbQv*~L6Tl7pFnfnnb134s$873#wSd_r86m6cUhRW&p;w6wIewY7D0bkx+;bai!u
zf`Zc1)3dU&LPA2q!ot+m)s2mfGcqzPEiEl9ENpCSY;A4h<Ksg^L*wG&+}+)il9Dnr
zGu_<W0s;cU!^01HO*I5s#aZAHS<Jw|%@4wilYTNU1q$x*ba4!caIb%R!&|6Xfu|u+
z;L+-ij-_8O{+_=%P0ipkH%t1g{Hb&8-wCN6;lC@veP&IjN$tN&Wq%DeN&i~6lws+^
zhdgI{dR{C3Z$EinlxtnvP5(+BW#2Q$RPFB`i{iX^i6wh&i)h9q78Onpp$RGqo(_{5
zR2V&(U;+!IRc=INul3gDp38YYWZ}VO;gQ+u|L>LUvNpK2eX-7WscDaW-W@)*^mD|i
tPUo!;oMUDleXvlb>RrLRU&UUvj2bI-UU5AS<^%eK!PC{xWt~$(696y<gdP9@

delta 1137
zcmV-%1djWP1D6Sq83+ad005~KU}KRXAb$yPNLh0L01m?d01m?e$8V@)000CmNkl<Z
zcwX(B+e=hY6o>m?BKl7v>M^=J74{HG&^?RP9=czk>_+vX7Ni-OL1H&F%6jPn*2Dz*
zkb|W(h6>(LlwIG7HJmx^GtQjCX2!MPW9IC=&V}>)owfHlGiTZI6)T-#m=O%YjDKJV
zW&}epBN#$nMp(ablWS_e<NEtk&Z0B|t<VhZe42(?&<Jd7U|_(VIeX5nTD``bV-z1~
zg=T1nhQ6F2IgQZW{mR{GY4P?Mr2`tGrLRwkGy*O%6O<2VnX58*jlj4<N%8d=r3;!y
z%^AE#z&VUBzCNRLLDQ(J;57m>PJf#imLF(}w!S{E5eQ$qQTjw_YeraNL}_bASYkwJ
zYeraNL}_bASR}S>uXOtkRJqk_)_VIFizsc2-UyqwRJiU}uifbAsGFFW5R%EHJ9_N6
zH@{fv?d_BEdgA11Z~tOJ_}Yuw2#q&yx%v5dIUZm1^z?YwD@M!+F{!U_kbmPK5S+?D
z`?~cTTt~+vF$gF3f0x>PF(breWMo8+gJHqfUsHP|%LKdk>~(M6zRe6D(AU=|?ZNeW
zK75eA+fB`4u-VyJH#avY4_dZY?#Rl8wzdZ{ED_}Tw#l&!4i3t8fbX;gbIb@axP0ZR
z9K+1aOx{<#R*>oGX%QOHbbmQ0unIyuqLHgHG&Gd8&5wzMv{QY^V;x;STwN<UJho*S
zQmK@fKy!kkn-OC0u)ST5fs^O!kD}_}p{!*+`7d6){G$!Q)MSXMv3LIgX$u-FSOGY;
zd#(2~%UZdDzs<DVy(?{BzVv6>%m^_+IHFJ^FpsEjXmqXj+vKyM@qgwY+fhLfE4VJz
zfKZ_{j|poqF9^8=l_1<VIyNSKYBn=M3>d!&t~Ou4kEhR`NjWB_rlvAO1Cfsr!b0hl
zo=Z5r@^eMlSZ0I**ix}IBP#O+UruoDKshJEW&HewI%$t%1g>%-YX6{f8FG18<ije$
zU!ubU;)Wj{A@<j=-+$b@_wQx7?&2lM4GIpF^>BN>MtJo2i7X>>&~)tk+VvaqopvU)
zm^OUJaq9G$tYtI8U!W(CNT-Kg^7Chz<Y~3|o=%GxT0wwk3|xtwon4vXA&wE)?(pyr
zX&WCOm)lsLXmY2)eyVGJ-!<s)Ks)<ne!?v#kw|=s-2VT9@PD-zwGn{(c)e}YK;X`<
z=UG=OS3hECARe=OB90M&hgXQN#v>*tCo>g6VL!n+3Bh`-uQ_Ife}w*M!>6xb*|}@a
zf;okP;qu*ga9&W1L}^<xMlk*jQQDdjmKagmdW~RzUM)`w{`0E+oxMCM`0woYf=hW)
z@Cz=0bL^G3@?Ig<D{qRu1X~`UVeFS+6<kC~VSKR(Wa)rbXohyVDuJ?~5rA=pjWOf2
zD2+fXG>e)OgvrYYM)_k#Fa$G#A(#;i!Hi)1Vx{{Dsri+D9MmuM00000NkvXXu0mjf
DgTyH{

diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.Designer.cs b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.Designer.cs
index 066b8e5..a5bf402 100644
--- a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.Designer.cs
+++ b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.Designer.cs
@@ -33,10 +33,9 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
             ProgressBar = new ProgressBar();
             labelMessage = new Label();
             IconBox = new PictureBox();
-            buttonCancel = new PictureBox();
             panel1 = new Panel();
+            buttonCancel = new Label();
             ((System.ComponentModel.ISupportInitialize)IconBox).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)buttonCancel).BeginInit();
             panel1.SuspendLayout();
             SuspendLayout();
             // 
@@ -71,33 +70,34 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
             IconBox.TabIndex = 2;
             IconBox.TabStop = false;
             // 
-            // buttonCancel
-            // 
-            buttonCancel.Enabled = false;
-            buttonCancel.Image = Properties.Resources.CancelButton;
-            buttonCancel.Location = new System.Drawing.Point(194, 264);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new System.Drawing.Size(130, 44);
-            buttonCancel.SizeMode = PictureBoxSizeMode.Zoom;
-            buttonCancel.TabIndex = 3;
-            buttonCancel.TabStop = false;
-            buttonCancel.Visible = false;
-            buttonCancel.Click += ButtonCancel_Click;
-            buttonCancel.MouseEnter += ButtonCancel_MouseEnter;
-            buttonCancel.MouseLeave += ButtonCancel_MouseLeave;
-            // 
             // panel1
             // 
             panel1.BackColor = System.Drawing.SystemColors.Window;
+            panel1.Controls.Add(buttonCancel);
             panel1.Controls.Add(labelMessage);
             panel1.Controls.Add(IconBox);
-            panel1.Controls.Add(buttonCancel);
             panel1.Controls.Add(ProgressBar);
             panel1.Location = new System.Drawing.Point(1, 1);
             panel1.Name = "panel1";
             panel1.Size = new System.Drawing.Size(518, 318);
             panel1.TabIndex = 4;
             // 
+            // buttonCancel
+            // 
+            buttonCancel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
+            buttonCancel.ForeColor = System.Drawing.Color.FromArgb(75, 75, 75);
+            buttonCancel.Image = Properties.Resources.CancelButton;
+            buttonCancel.Location = new System.Drawing.Point(194, 264);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new System.Drawing.Size(130, 44);
+            buttonCancel.TabIndex = 4;
+            buttonCancel.Text = "Cancel";
+            buttonCancel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            buttonCancel.UseMnemonic = false;
+            buttonCancel.Click += ButtonCancel_Click;
+            buttonCancel.MouseEnter += ButtonCancel_MouseEnter;
+            buttonCancel.MouseLeave += ButtonCancel_MouseLeave;
+            // 
             // ProgressDialog
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -114,7 +114,6 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
             FormClosing += Dialog_FormClosing;
             Load += ProgressDialog_Load;
             ((System.ComponentModel.ISupportInitialize)IconBox).EndInit();
-            ((System.ComponentModel.ISupportInitialize)buttonCancel).EndInit();
             panel1.ResumeLayout(false);
             ResumeLayout(false);
         }
@@ -124,7 +123,7 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
         private ProgressBar ProgressBar;
         private Label labelMessage;
         private PictureBox IconBox;
-        private PictureBox buttonCancel;
         private Panel panel1;
+        private Label buttonCancel;
     }
 }
\ No newline at end of file
diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs
index b00e8c6..ac5336b 100644
--- a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs
+++ b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs
@@ -46,11 +46,13 @@ namespace Bloxstrap.UI.Elements.Bootstrapper
             if (App.Settings.Prop.Theme.GetFinal() == Theme.Dark)
             {
                 this.labelMessage.ForeColor = SystemColors.Window;
+                this.buttonCancel.ForeColor = Color.FromArgb(196, 197, 196);
                 this.buttonCancel.Image = Properties.Resources.DarkCancelButton;
                 this.panel1.BackColor = Color.FromArgb(35, 37, 39);
                 this.BackColor = Color.FromArgb(25, 27, 29);
             }
 
+            this.labelMessage.Text = Resources.Strings.Common_Cancel;
             this.IconBox.BackgroundImage = App.Settings.Prop.BootstrapperIcon.GetIcon().GetSized(128, 128).ToBitmap();
 
             SetupDialog();