From 37f2bb5eac77e6fb73c8a56356b8a1f35df291d1 Mon Sep 17 00:00:00 2001 From: Anton Mukhin Date: Tue, 27 May 2025 03:40:34 +0300 Subject: [PATCH] HotFix: Open file from OS --- McBitFont/Export.cs | 4 ++-- McBitFont/Form1.cs | 19 ++++++++++--------- McBitFont/New.cs | 4 ++-- examples/helvB08_PREFAB.mbf | Bin 46643 -> 0 bytes 4 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 examples/helvB08_PREFAB.mbf diff --git a/McBitFont/Export.cs b/McBitFont/Export.cs index 73c8bc5..9bd7b4c 100644 --- a/McBitFont/Export.cs +++ b/McBitFont/Export.cs @@ -233,7 +233,7 @@ namespace McBitFont { if (com && lines != 1 && fcount > 1) { // Comments enabled and other than "1 symbol per line" selected // Print a symbol comment before its data - output += " // " + f.code.ToString() + " --> " + mainForm.decodeSymbol(f.code) + "\n"; + output += " // " + f.code.ToString() + " --> " + mainForm.DecodeSymbol(f.code) + "\n"; } if (lines == 1) { // "1 symbol per line" - new line offset @@ -369,7 +369,7 @@ namespace McBitFont { if (!f.Equals(flast) && f.width > 0) output += ","; if (com && fcount > 1) { //...with a comment - output += " // " + f.code.ToString() + " --> " + mainForm.decodeSymbol(f.code); + output += " // " + f.code.ToString() + " --> " + mainForm.DecodeSymbol(f.code); } output += "\n"; } diff --git a/McBitFont/Form1.cs b/McBitFont/Form1.cs index a9b011f..56d8659 100644 --- a/McBitFont/Form1.cs +++ b/McBitFont/Form1.cs @@ -70,6 +70,7 @@ namespace McBitFont { public MainForm() { InitializeComponent(); + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); this.dotPanel.MouseWheel += new MouseEventHandler(this.DotPanel_MouseWheel); } @@ -118,7 +119,7 @@ namespace McBitFont { tsmiCodeShift.Visible = frames.Count > 1; CodeShiftToolStripMenuItem.Visible = frames.Count > 1; - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + } [DllImport("user32.dll")] @@ -681,14 +682,14 @@ namespace McBitFont { Application.Exit(); } - public string decodeSymbol(int code) { + public string DecodeSymbol(int code) { var enc = Encoding.GetEncoding(codepage); if (code < 32) return ""; return enc.GetString(new byte[] { (byte)code }); } private FrameMiniature DrawFrameChar(FrameMiniature ff, Font font, int sx, int sy) { - string s = decodeSymbol(ff.code); + string s = DecodeSymbol(ff.code); Bitmap bmp = new Bitmap(ff.width, ff.height); Graphics g = Graphics.FromImage(bmp); g.Clear(Color.White); @@ -766,7 +767,7 @@ namespace McBitFont { foreach (FrameMiniature ff in frames) { var s = ff.code.ToString().PadLeft(3, '0'); ilMiniatures.Images.Add(s, (Image)GetMiniPictue(ff)); - var sss = decodeSymbol(ff.code); + var sss = DecodeSymbol(ff.code); miniList.Items.Add(s, s + ' ' + append + sss, s); } f = CopyFrame(frames.First()); @@ -874,7 +875,7 @@ namespace McBitFont { foreach (FrameMiniature ff in frames) { var s = ff.code.ToString().PadLeft(3, '0'); var sHex = 'x' + Convert.ToString(ff.code, 16).PadLeft(2, '0').ToUpper(); - var sss = decodeSymbol(ff.code); + var sss = DecodeSymbol(ff.code); ilMiniatures.Images.Add(s, (Image)GetMiniPictue(ff)); miniList.Items.Add(s, (chkHexCodes.Checked ? sHex : s) + ' ' + sss, s); } @@ -968,7 +969,7 @@ namespace McBitFont { var s = ff.code.ToString().PadLeft(3, '0'); ilMiniatures.Images.Add(s, (Image)GetMiniPictue(ff)); - var sss = decodeSymbol(ff.code); + var sss = DecodeSymbol(ff.code); miniList.Items.Add(s, s + ' ' + sss, s); CheckForAdd(); } @@ -1189,7 +1190,7 @@ namespace McBitFont { frames[i] = ff; var key = ff.code.ToString().PadLeft(3, '0'); - var text = decodeSymbol(ff.code); + var text = DecodeSymbol(ff.code); ilMiniatures.Images.Add(key, (Image)GetMiniPictue(ff)); miniList.Items.Add(key, key + ' ' + text, key); } @@ -1228,7 +1229,7 @@ namespace McBitFont { if (frames.Count == 1) return; foreach (ListViewItem item in miniList.Items) { var code = Convert.ToInt32(item.ImageKey); - var symbol = decodeSymbol(code); + var symbol = DecodeSymbol(code); if (chkHexCodes.Checked) { var sHex = 'x' + Convert.ToString(code, 16).PadLeft(2, '0').ToUpper(); item.Text = sHex + ' ' + symbol; @@ -1340,7 +1341,7 @@ namespace McBitFont { var s = (last - first > 0) ? newf.code.ToString().PadLeft(3, '0') : "000"; var sHex = (last - first > 0) ? 'x' + Convert.ToString(newf.code, 16).PadLeft(2, '0').ToUpper() : "0x0"; - var sss = (last - first > 0) ? decodeSymbol(newf.code) : "Single"; + var sss = (last - first > 0) ? DecodeSymbol(newf.code) : "Single"; ilMiniatures.Images.Add(s, (Image)GetMiniPictue(newf)); miniList.Items.Add(s, (chkHexCodes.Checked ? sHex : s) + ' ' + sss, s); } diff --git a/McBitFont/New.cs b/McBitFont/New.cs index e41d0ec..4441164 100644 --- a/McBitFont/New.cs +++ b/McBitFont/New.cs @@ -108,8 +108,8 @@ namespace McBitFont { Bitmap bmp, result; Graphics g; - chars[0] = mainForm.decodeSymbol((int)nudChar1.Value); - chars[1] = mainForm.decodeSymbol((int)nudChar2.Value); + chars[0] = mainForm.DecodeSymbol((int)nudChar1.Value); + chars[1] = mainForm.DecodeSymbol((int)nudChar2.Value); for (int i = 0; i < 2; i++) { bmp = new Bitmap((int)nudNewX.Value, (int)nudNewY.Value); g = Graphics.FromImage(bmp); diff --git a/examples/helvB08_PREFAB.mbf b/examples/helvB08_PREFAB.mbf deleted file mode 100644 index 6e650fdc4093a7052dfe13c0b605783d9c38fff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46643 zcmdU#3%sXewa52n%-SSJj^j9vG%g{gX-JX~Lql!}NycrP+016o-kRCtmJkw>BuSDa zNs=TlN%xD={eHh+&iXyide*bnf4~3zy#M$8@A)|I=gj|I>-nzB?^*BjfB)M# zXJBw(VBp_;;f`zV)%aug0~RkBom@CEJ~?;JVI#{|j82U2y4}1T=gprtf9{+;SB_1t zTt2ev_{hr1<-=oh=Nz>1xUtd2`;DA_=)_4QmjY@sZ`Di|6e>x?=L!?G`Pn=(i9>4j3ID z9fsz)b2Oyk#*R7)^BH)A|Yye1 z*-J-8PgpuRYsv8BFq74XhK3#|&wjzg#MsF2_@cQ%;vA-H^S{UPzcpv`$KYSNU+8Jc z5Xhf}Y-Y(?Ab%9Hxg{t&_>9k|i60{8-2~mTUy_Lm}H*vN6abLgres3CQ<^JlT>tAm0@-&k_uA@Y_P3VhKhy z_)Q`6Ex|wrzb<4uOR(+1uL{}T5^QepAt6t-1X~z^7P6}) zyMug42*NaH0mui1Jj;^3Kt3R3cS{z6ykE#3mh1!aJ|QTref9-;uaG@0*&pORLeNxm z4g`6(kY`(R5XifPK#t}d4DwDPds}iS$UB5UsOB67@^&H5vE*=&w+X=(H0KDAw+h+M zk|ROhB4mF{js|(NkOM3^7UWGrux;&g9LO7mJlB#XAa4+YfoRV0Ag>qlJWG~>yiN#4 zr8y^pyjI8|mW+YCMhJ$eIpZL&7V>;cP6m0E5R6xImV>-f$O|l)1bKxJ3|@0i0l7%X z3oSVfPb=9~-i5+TP}az4n5 zg&b?i1t6yj!S9w_JRIOIxh z1$my3m6qHF@?0S}{+e?;$N@r5wd4+v{e<9)p*eSgJV(gsmfQuhw-9_~H0N%RXA60; zCHH{rDFk08&AAt34g$fiPGY01MNPY{CFhW7bB$m4~) z%90;|{I3waP&DU9Apaxe)t3AOeT(L z1@cEBZ?R-;klzczOI35$0r{0BG#M@Kz=IZ z?Url^@?#-*MQhGRAU_oH4ofx$c|^!9mTUs@Jt6P3WDdx8h2XWWeKrI6wvcyOvIWRD zh2Vv+Ia`8!UC6sF*&5`lLhw_dIop6dB;-Ao%msN+2!13qXCBBGg}m32`5>Pcf}an~ z*&gJxLf&V|4j`Wvf*%&m*%9QELf&u5P9Pr_f}b4C*%{=cLOx*0E+8Kfa*rjufqYoV z2QAqhO4wPXRv2ZemdlD$AaAmlzv7J|HA$cHW22jqQ1@YAOI*%#!!LOx>2{vhuW zf*(E2IS}OCLOyEAK_KrEf}capIT+-fLOyQEp&;)Nf*(rFISl0OLOyB9;UI4lf}c>$ zIRfOZLOyNDksxmo@)=8x26?lP&suUU$eV=VXIJ|i2l7TCpSNTQ$Qy*<2U&BD2YJ1a zFIut`{5Cg1lD9gO-eeyhaFq#5HFe$fYJ{NDgf@5U;vT4rUAkP-^cT4U8*;5GqnA4nlLG}>xPfP9td6p3TnWs7TgX}8g z-I zRjxj{a&>Oy>b8}u+f=STsd9De%GIqZSGTNOePZS67L}`;SFUbWxw>iP>YU2eCseL( zQn~v0%GHglR%te$+SOL$k96P%_*6f7FB)QP1-*l~_`lP_E}XOK_eE>f(wl`rdiCXq zbE@MTtrCtwVZQv<1&tMnWZt)~TV_$_mnhw6F(==L^*=>Ci6C`f#Il zxkzEYNl<79RoXWa9XEDhm@`X7GLO|d%M&6 z9AD5IG^Mi6NsFuQP8*cx3C=1(xOecK;ioqTkvDgYW$R2YUm}M=5TZ!y;&D1(UJJd zPW$TL7HI1ldfi#DGj$T3(?5m25^YmMZx~Y=DIAs-%0yefenGE(7h^~a^DSF>G?&v$ z?}yM;T1TZ>Z;%|t%YdUEj!3&|C9orz=J7&FFNcUgWJ3w=xUyQT$14KsXlO86eb9VP zFY4vyNh5Tqd|8h2!*ZZpGHe8qeZFXWE?CkFjj4CE#e+o7kFp@%#9>o2pm&F|Ue`6~ zOG-px(rfe?v#%4T9m{&diA@5+2(w-{-^ijqj!#kj6ihqS(#sQ+DF;p10WN$hifaA7 zLR3FLXlJfgI=?|)65^eHYN=C;cIiQ{3>6bq^>v!`F@|=lqc=VO*w|{-(*R_hu($9L zllt^YyK|x9d0-``brYvgatCNZ4ZVI=>}B!J>HZk{C3k@Ks-f3)%UW@ap`pJ&u_?< z6x2y_vx$h%IYtGLdv&NdMiOGrkkG=U5hB%TG<#2dog?>Y{e_1a^ zm*)|Ms17!=c&w^;2OYJqqjlNHYs#OS#PYLXUBd%9)J;5jWnkA@sp0^Vr}MYln240 zjqQA7(|-D(n~rX&7aIKNt*Y+CM)hFRu^ilZzL=4gt4B-9dc&Y}Cb48Oh-Bn4?`4otBjKRqiSFTwnOFFb|Ksd|;eh^bN_6i*$ZcnwBFaa@=y zpwW#CI*rq6>CHltrmzByx{w{an%{DbB)TLzgWZx|5f*RwOcGfr%&1rXcMRglOsAxV zh2|f0Cg+y)hOx=S)P}C8%^J;>)XSu^IIgJI)e_-(EuV+HHd7Xz!<9>VQ}ZxV9Wbw| zt%FXXGj*qPxpF}-gysIMQ5|CQ6gS)8A9(rJ~ZZo)Az$q8O^THNU>PA=&UU$^w#u}+J|4O8jr>Gfh{{DkGQ zPQ!*R)94y5P?~R6%i^tr=J|yiVG@J`uS`yMV$JV#E$6n<+q`#^OuDYDHw{(l#{nlt z?%~$``_?2UK1y4kZMvR63iIuQ-pbw`Qfj$$Lmj=LU8*;AR%x#8l)5liAQftIryJ|& zjlI(wO}x;~OT?0j4`Cq)t9&K9&7E%I?BaQF?V?<1TGCs!$5wi8uA|pW44&1S1oUNs zsaW-$ZsGMh^VR2!S@S>dZHH?9^*?S&e3yb1jLk z6a>(XWh=My7Tw8y4ZYo_Xx5`B)7vrMwy{Tdb}0k6eTEp>RE$rKtJcP$dpNtxdC+EIY@#vP={V+yHX3@#rF*;Ut*n!@ z>$oeUW^9q}J^eN7)rPqrnjG?KVVjg{_j@~%NPz*m1xZwCL^mUG*SH%Z?ju-nmU%!XG zKL+|j4|?-{YwB=e&dH@ZEf?k-MADb|qc~spg)vS%8ge|G({VUVPN%-!eEM>2y{Tuo zN5@HYj_9q(=}li}G<~I>-qaXhGF-7vw8g_qjMpP_PG{2=K7FmMH|yhARfML2sCxKV z#f8N}UJUH`EalKQIH7ocLs1zVD)JSVj4gwe{t@`FycrIv<7gigjXmjGY}V1M^)(em z!btN};X zD#%0dz4OV#Q9DQq?_(ep0E|C)jb~wd(0A_2_41y(}X!mnI(Ooj->E#hZ0?|HWs@Om!ru8^f$Ka=}m=EN&8#dw01h+*f{3|!Kri%%<8m_ zF3~^OEbHY&lgkaYfE|!ooGFw3RY$Lzh;usRntix1=kz#Iw{^lpEY8=pGY;e>iI_Q1 zC?9O|q7JJOx%NFfv>I2Ls@Ii{0+SN)M3xD(e`PR@aY<0{lGEZ&vnus=RCK+a69Rc9 z-ILj=x1(TVmuA<|+qit+6KSZdSEd(xW4dhdzj%i)3vs4^c$>uKkYvnQr1>YU)kQBf z@D*>;oE>O`$CstB6G0kZ5+Y8#wg05Gxy{t?TSZ~$(<`XWUa-O@;y&!2G^#HKty4#D zkdpdAxQd^~aRW}tZSS;hS#Q0vQ=5_5xjtPSTEB+g@O76% z5R~%qmG4{pmWA^X7t>C-Y+zmbHeIF-%6cII7x$1CRdm7*;wsuhVZ0$MJ79ggXhW`C zd_RcV&=s13uz1Tu6p?`^#mUK;k{ba^q`ilb;s()n946H<(miUvVD$P$? zVEDil!pvqkp)VVwoyvOCvyDQ;3l1K8G~`qLX>wcw?~E&?BEg*2p`95Q-oM-c?Ngs9 zB?&~YghK1&SddcN-)R@FUq`QbwjEPdfnip8U){r6$fn(<*9$S}$Ob9uv}oEQm3E(A zZzvrOgN!kr44ERYg)I^juZQcg)r zjqbEprQXz3YWlBO@B--wYowsJBwARhcWMz#HC{%%G2>y#qt2T`mJ5u2EY|BM?Ninp zn~7fUuo83+UHNkw2YD*a+PYZFpnbVY;rx1u;*})YFr3}y65T#%|CV}lwLCsvb54$F zZP9^cz0xF3NahyxcqhhH5s9;EV>P={%cg_Mdc7*!n{y#gBzARbDXAAk2iMRWONlDJ zL9(m`_1a2S*_U0Voam;w942w8m?@naq#U`^p$rP&w>ZC4Al%c-qU%VVURDKR9jzO= zbXZxh>+Kx0%tEqNm~SJcF^LXutT)X#-noqGjpGbE3tfVxw1ry!|JOL8vEJC1)6*4Y z$#T>msl=Gjl+yE^j^rw(^D7d<&CN<2%SD0HR+ZxdB&o)YjxOu%-VVex34z`h&k&ar z*7+lZImeW-CLP;GFITd9jpKSd$9C`CrsK+ba&7*vO!zT($Uqu+3p7De;~r z9|c5}qE(!5(MM}l zux^%<+4fH3WxcU`>f{s#*`hsybU4I|SvIWQ%YsfW>-DD;9*YtAkd<~4l;rgs<_c(Z zBZHRL(Hn;q8bs5Gm}jdU~~J=&c?bu5GpB^g72Ds%6tD_4J}k zC|K35LZu6Hj>u|~!>M%I|0BJ;Z#tufUi+l{Tx4>UlSiaRPvfA5cCfZC8iUT{*y8&) z$_i=G%pIl?!tp93q-o!3Rj#yiG;x5=di3bcs=8ZrPFZgllbICz;>EjoyoTk7cnyAZ z!izcCSj~2KWz~ev<&tgBLn>{B#OE1FlqVw776Njl&bH|M>GY=BD4W_jA>35f*?7(*@k3FyEjNP6*qR7;%FzM3i^zw)_N6n7; zazG05#LX9FY&9+0qd}KVr&o)icXEP`NL93<#qI;l?p~{b@FgS zh}oChR!5jA;7XUbKv&e!Yv;x`r=SfkuL?Vf>ofI9SJu(%R5>R|R&iFX3v-T!H!$d` z7J8$+B$5jy6NZ!MoCY#Ag|2R)H&o$#y&x+&QL=bpRZ$9QaHngyO8NH~l~X%6tKg)* zDI)k&!yHaIJ>KcsI(nz;ohK?XRe>SX70~!P23^-$uWe&S*f)u`{s3KHM{oG@q&zPK zt4U?Js}tgEQnK6J>4rLby+kV{sS6ssVi*$QEy)rhmh@-R3vUp%2F3dS0fLCmZx;EWWQ*SPa-r36nJ9aWvqD^XQ)15W- zW|32cB>9dwC&;TAHtkmEu1B5TJedmRbax%SE-{TM&Mb^kc*jUNFvo)BGS<$kH7vS^ zs}$d7PKa}Yq%5SCDp$ZcWx;gss@Gdq)jfjltD_gsRfmXYsn2t||5)bHb#L5|(EVJq y?Rn7N_Bgl)9fT+Kj)d2_7AP9@z;t?32h3B4722i39HBv>wGYcICA7Rh=Klcy!Q_7c