From 19b05431828af3b495f372ba95699df672df8974 Mon Sep 17 00:00:00 2001 From: Pk11 Date: Sat, 20 Mar 2021 20:16:26 -0500 Subject: [PATCH] =?UTF-8?q?Use=20images=20for=20=E4=B8=AD=E6=96=87=20(?= =?UTF-8?q?=E7=AE=80=E4=BD=93),=20=E4=B8=AD=E6=96=87=20(=E7=B9=81=E9=AB=94?= =?UTF-8?q?),=20=E6=97=A5=E6=9C=AC=E8=AA=9E,=20and=20=ED=95=9C=EA=B5=AD?= =?UTF-8?q?=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note: ko.png needs to be added to the t3s to be used --- assets/gfx/sprites.t3s | 5 ++++- assets/gfx/sprites/langs/jp.png | Bin 0 -> 734 bytes assets/gfx/sprites/langs/ko.png | Bin 0 -> 765 bytes assets/gfx/sprites/langs/zh-CN.png | Bin 0 -> 1113 bytes assets/gfx/sprites/langs/zh-TW.png | Bin 0 -> 1481 bytes source/menu/settings.cpp | 6 +++++- 6 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 assets/gfx/sprites/langs/jp.png create mode 100644 assets/gfx/sprites/langs/ko.png create mode 100644 assets/gfx/sprites/langs/zh-CN.png create mode 100644 assets/gfx/sprites/langs/zh-TW.png diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s index eef3353..bb7cc86 100644 --- a/assets/gfx/sprites.t3s +++ b/assets/gfx/sprites.t3s @@ -18,6 +18,9 @@ sprites/download.png sprites/info.png sprites/installed.png sprites/keyboard.png +sprites/langs/jp.png +sprites/langs/zh-CN.png +sprites/langs/zh-TW.png sprites/list.png sprites/noIcon.png sprites/notes.png @@ -44,4 +47,4 @@ sprites/universal-updater.png sprites/universal-core.png sprites/update.png sprites/update_app.png -sprites/update_filter.png \ No newline at end of file +sprites/update_filter.png diff --git a/assets/gfx/sprites/langs/jp.png b/assets/gfx/sprites/langs/jp.png new file mode 100644 index 0000000000000000000000000000000000000000..c03d4f0efcf6eee29272f03ba7d2e65b7f0c634d GIT binary patch literal 734 zcmV<40wMj0P)tC#V}&ZrmxTpa?~K)rH`$ zpdyNqf|`PYR@91hRVZk++NLB;Gsi_@NooYo?#%bi`G)zv8PRuB&D1+SwW?Sw2Fs59 zss;6?Ln2#w95~5sGqL-3!s48*%mqL-&zGqj%e{sw(qQ4ION(;~hr=lED=`&Z5vLVc z!@o*cRBL(84!f9y90kBKW}Cbb_i(*&?fCFa4?xVr@Dx@e-n)z9JT>i6yd8yBtj;@kDm)vzE zJ1u)5u>3 zxP3eZ@G=a$`9YgB@(5AU>)wG4vE+k4yh*5!%wkK~nqR<23=6SxFZ)(r)olXnFgdv@;ovB>-me(a5YADGp+~xg}js|O)HXc)@VO2 z+sSc)xVZ-4H?!Bov_qmS)wsFq)v*L&F%yJL5TZJY%jQ3x@66b+I((|p%64NS`5}Ei zT-ko6GYYiyrb8la30X&~cz;_V}sJ_>n z^i+yjB<{qhOfl_elF=FOyjUxcShYmtB-{KWV(GUQHL%W`&&@Km39EO011TEvXD(~n Qq5uE@07*qoM6N<$g8#W)=Kufz literal 0 HcmV?d00001 diff --git a/assets/gfx/sprites/langs/ko.png b/assets/gfx/sprites/langs/ko.png new file mode 100644 index 0000000000000000000000000000000000000000..07677f1d6ceba9a10f3ba591e91142a43a020107 GIT binary patch literal 765 zcmVB?xS_@+>bi$()26uYR1#)Y6@ z|4_TpQs;?E4QL~jt|}!BsSl*t#I%797?O5MYj6@0ZD!s(UFZzP1njpv-?`_0=YHpK zWh;9d0HSjEIS$W|=(umQ2LYlucPW{Y_qJt%X@GtX&1H(M+sh(`$6%G&iS+nLH+}UL zF5Dc>w+*oaRlSz#zuw0{J;04PJY$CoVT-BN#`1kGSWyE=RLr$AmrNqGXdMl}G{CAa z*1OcuZXApx#EXfNGlc!EUy;L}Mjv__VoHQZ4R4Pc`O)2qRPQSc1$OHHiJhjMP4e!jJCe_&!cuU)0 z0Z-}{aS7Lb6YPwV++{1hr7^yCPnjk@&_>dzGnGu@ztR@WL`iN@-A{joP2Otu0w`D# z{U)_fK8p5*pp@?AIs4j%U><-nKVWzs7zQvIcBpczYBdL0g=N1l!ImXm&vJkhi~_X) zW|RV3`Tn7>(MKG2YIJwaI(ZxT5-LV%0C_t)84ymT<${i v%fEU44`y^Q_N3`i%D2H`;P8^OF~9x?U#JSQQJr#5RbD zKR_i2L_YRHqd-Cs4N)Y)R+POV7z1c%OrQm-A=L_H*>-nlu0Pmfm+cCAe%(8B&pGdV z&U@~Rn87on7-k7itrmUeBlou0Ic{JHqs}iBO=G+03UHIAQ)+=5l6wG}sY%W^br&-2 zOc*>t`mshC)J7dOKU01A5LfydJ2SPkgs=Jf>V#{_NdP*l+FVC29v=JPI+b?%F%P{d zOPpqEk}Z55E(WB6ip&u3Bi(Au;1vdj-U-jF-)r^TL)~*+aE~IY?L8w)Gzy^s#2JwsiBMyFs2uT59TfqJwPfKV3I53odDX4e+uFf z81Emr!bUL57>)@@ah^BasO&2sb#iNniT2)Zt8-Q@E#X8`JuDoe{XfzcnZY~#AM<+T zMK-#YT&AY>dRL29cb@;E>(En(7psIzKCzBqHOh5O_sn%yu>~C^l$c?Jzdew5Q?(coM_lk&9|NfL^mP zgH4_DU&rgnMK#?jH=FS|fXs{?csDSvbiDain>Z#TKB)@IwIlgeMdbI|kGCee)uyVb zOy-d~%QPI%2Jp_=i;EW7i8bVw-{ihyv4TS{g|={o<`Ib*A?y*Q;Kw_FURT7XNtk>Jo1KQK1K?D3UpdM fjiJO1%P;>1Tb;(|KSsfS00000NkvXXu0mjfy^#t~ literal 0 HcmV?d00001 diff --git a/assets/gfx/sprites/langs/zh-TW.png b/assets/gfx/sprites/langs/zh-TW.png new file mode 100644 index 0000000000000000000000000000000000000000..9132dc5a4e2269ef9b638d45d23920b0f94b5eaa GIT binary patch literal 1481 zcmV;)1vdJLP)X05q_Y~sC9}Z#g?3f(Ecb|K89&dJ0J}qCpjeNBxiS@{=lRJ0`jl- zubund_kN%IeLi;O4!&8+CGgU(-N>HcxbtXJglk|AZG+|gH`Qi-BZux?>&CbabZj!i ziDqtc%G?xymo-aLiQ{`8W@F*#I|tu4Va+|Rbv=3qQf8(VBerPfMLmGdw5eKH>iz@Z zN&_XAyUO_)2)?z_s}zAN^hYoCLyw>go< zbpTc&&k?X)Lk0oV=fvDh^gZFXo)1%{98iZt13Q#f>khEpH2E^5QvM-LyovJbeNAt^e72w!)G^n z?IO=N1fYPgX-@XwYfzB(hbBy0skCNK@_m30It+~PszzxPn^N`pl@+HE_=u3d9=na2 z$|H2Fh(7tkpAVZNU^0M)>=UH~7*I>f#UgDv~0Mm-0j=fX(E#y{W8FUGPfJ(PUg%Ov2>18*mz*H_vVI`Pe@DtZD&W* zq^s7X&|g>O4gtg#(SpqyQ7u5EKq54QPG^MQsYrU>5%vTlJl{=sH1b8BMD_2Y@)iI# z_Yv?ffl`Gif-OpX+*v*0Gg@XfOxU;uK@eOm#svlLn?$6pf{Hvqd9LzXgq*piv5U8U ze)QRixZCix9i+_U`t7-q!m%PZQHe zhdSlHPa7tpM8}y`!SCZ276kSb+EnG7%wjpBQ+P2~EzOCAv85C_arZUPH@B$GgMcqX zY$%*fF*X}6)r%DKHz4)DLLp~?rpf4I;Q-Cy0L?&Nv(idhTV#kQP|02q>94cxSbBTe zO1d;FPv2eZ2A?`AZKjW_fS9{kk8;8)VKKra2{?<*og52W_1lTn^3UMIn)z;iEZ9uA zOhUQeyty zQujkQ4xmMrL6{|g?FRw2y-Z5D;}i9{V)H&g8%qaC$hzUvte>#wa<)BYW^~X1{P8cw zPKIVLMb_5dU2=QMI#ENwG5I{Fyu4Ze&Q5dH4EFApA6vz=jS*Y3FXzwGE*6dXK6w%7 z=8=4xgrpS7uuqr8`UuDFrj;*<>V5#HdUY0MC;j0H&II?PoC==e_W%#1mRF!0zO&r@ z_)2q1Pc%#ZaypqaOA8%sl`KEYK1*$VgKIy`#zH6I{(*hDaz^w}*$UnMr<9p8k-7Q? z*Cwl5lOtvwfHo(V#HR8f9|cv5rnx5ooE=S*oT&RFy}%B=TYgaUjGGwUZ>?pTBJ=VW zIFrnq@1YuJvaDx@^%GRP?4R-ofc+V^vp@GdfL#9j_5VU=)_iqg!hK_+HE;iR%URqM jdYiZ9opmkI>(%@(x6frdjF=~e00000NkvXXu0mjf+nm dirStrings = { "CHANGE_3DSX_PATH", "3DSX_I /* Note: Украïнська is spelled using a latin i with dieresis to work in the system font */ static const std::vector languages = { "Bruh", "Deutsch", "English", "Español", "Français", "Italiano", /* "Lietuvių", */ "Magyar", /* "Nederlands", */ "Polski", "Português", "Português (Brasil)", "Русский", "Украïнська", /* "עברית", */ "中文 (简体)", "中文 (繁體)", "日本語", /* "한국어" */ }; static const std::string langsTemp[] = { "br", "de", "en", "es", "fr", "it", /* "lt", */ "hu", /* "nl", */ "pl", "pt", "pt-BR", "ru", "uk", /* "he", */ "zh-CN", "zh-TW", "jp", /* "ko" */ }; +static const std::pair langSprites[] = { {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, /* {-1, 0}, */ {-1, 0}, /* {-1, 0}, */ {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, /* {-1, 0}, */ {sprites_zh_CN_idx, 54}, {sprites_zh_TW_idx, 55}, {sprites_jp_idx, 31}, /* {sprites_ko_idx, 30} */ }; static const std::vector ThemeNames = { "THEME_DEFAULT", "Stack" }; @@ -121,7 +122,10 @@ static void DrawLanguageSettings(int selection, int sPos) { for(int i = 0; i < 6 && i < (int)languages.size(); i++) { if (sPos + i == selection) Gui::Draw_Rect(langButtons[i].x, langButtons[i].y, langButtons[i].w, langButtons[i].h, GFX::Themes[GFX::SelectedTheme].MarkSelected); - Gui::DrawStringCentered(20, langButtons[i].y + 4, 0.45f, GFX::Themes[GFX::SelectedTheme].TextColor, languages[sPos + i], 280, 0, font); + if(langSprites[sPos + i].first != -1) + GFX::DrawSprite(langSprites[sPos + i].first, 160 + 20 - (langSprites[sPos + i].second / 2), langButtons[i].y + 6); + else + Gui::DrawStringCentered(20, langButtons[i].y + 4, 0.45f, GFX::Themes[GFX::SelectedTheme].TextColor, languages[sPos + i], 280, 0, font); } }