From 4004525d3ac2265f71c0c0a4abc84b3c715d9171 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Tue, 13 Feb 2018 22:23:59 +0800 Subject: [PATCH] english i18n --- .../org/jackhuang/hmcl/setting/Locales.java | 2 +- .../jackhuang/hmcl/ui/LeftPaneController.java | 5 ++++- .../resources/assets/css/jfoenix-main-demo.css | 17 +++++++++-------- HMCL/src/main/resources/assets/img/alex.png | Bin 0 -> 2105 bytes HMCL/src/main/resources/assets/img/steve.png | Bin 0 -> 1350 bytes .../main/resources/assets/lang/I18N.properties | 1 + .../assets/lang/I18N_zh_CN.properties | 1 + 7 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 HMCL/src/main/resources/assets/img/alex.png create mode 100644 HMCL/src/main/resources/assets/img/steve.png diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Locales.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Locales.java index 7607c6896..66d249351 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Locales.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Locales.java @@ -32,7 +32,7 @@ public final class Locales { /** * English */ - public static final SupportedLocale EN = new SupportedLocale(Locale.ENGLISH); + public static final SupportedLocale EN = new SupportedLocale(Locale.ROOT); /** * Traditional Chinese diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java index 76b415168..01ebe25d1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java @@ -126,9 +126,12 @@ public final class LeftPaneController { ripplerContainer.setOnMouseClicked(e -> { // clean selected property for (Node node : profilePane.getChildren()) - if (node instanceof RipplerContainer) + if (node instanceof RipplerContainer) { ((RipplerContainer) node).setSelected(false); + ((VersionListItem) ((RipplerContainer) node).getContainer()).setVersionName(""); + } ripplerContainer.setSelected(true); + item.setVersionName(Main.i18n("profile.selected")); Settings.INSTANCE.setSelectedProfile(profile); }); ripplerContainer.getProperties().put("profile", new Pair<>(profile.getName(), item)); diff --git a/HMCL/src/main/resources/assets/css/jfoenix-main-demo.css b/HMCL/src/main/resources/assets/css/jfoenix-main-demo.css index 86bab0f22..868232e52 100644 --- a/HMCL/src/main/resources/assets/css/jfoenix-main-demo.css +++ b/HMCL/src/main/resources/assets/css/jfoenix-main-demo.css @@ -545,16 +545,17 @@ * * *******************************************************************************/ -.jfx-list-cell { - -fx-background-insets: 0.0; - -fx-text-fill: BLACK; -} - .jfx-list-cell:odd, .jfx-list-cell:even { -fx-background-color: WHITE; } +.list-cell:selected, .jfx-list-cell:selected { + -fx-background-insets: 0.0; + -fx-text-fill: BLACK; + -fx-background-color: black; +} + .jfx-list-cell:filled:hover, .jfx-list-cell:selected .label { -fx-text-fill: black; @@ -564,9 +565,9 @@ -jfx-rippler-fill: -fx-base-color; } -.jfx-list-cell:odd:selected > .jfx-rippler > StackPane, -.jfx-list-cell:even:selected > .jfx-rippler > StackPane { - -fx-background-color: rgba(0.0, 0.0, 255.0, 0.2); +.list-cell:odd:selected > .jfx-rippler > StackPane, +.list-cell:even:selected > .jfx-rippler > StackPane { + -fx-background-color: derive(-fx-base-check-color, 30%); } .jfx-list-view { diff --git a/HMCL/src/main/resources/assets/img/alex.png b/HMCL/src/main/resources/assets/img/alex.png new file mode 100644 index 0000000000000000000000000000000000000000..ffd8e0719a1a4fac1f58895ed3a30130d3aa4b46 GIT binary patch literal 2105 zcmV-92*&q`P)E~eMGYDf65)*| zViT=e&nSo{8jS>AST+16Bm|5oP~|Nz*84u)@ATQ{X0O-Vy|!F8`DSKkcJKE4nP+Bq zb~Xqm*sdL17K--Ohei29dba=Zk_u98mk;K~G_bTdUr0y#7M4`%O`9cvi|;Oy^shrX zXLN9PTTGb&P-Y3>^!_E1UOCk4jDEDcJ*MmcM22COAOt`Jgy!Gh-V_rdWDx-{46_6w z03skXf3T-HCPK(00%8DEH$ZvS0Yru!0M!jpJ|zGk0ie1A_5tAX&mUAB03-lZcfdXX zT>9z5Dg!Wsp6>rp)d846PxpVQ>Hu7S*LMLG1q9$z764p-*LMLG1q9$zCIIx{$5yvp zpp?@7zaIS9>b47%QrRI+qcmyzyh}Z|Mc;86oG<0?YjZlZZJ&3k=eFoOPJ{EM{QV%& zNWz7446tUBpt*8S6rn89NWz7446tUBpt*8S6rn6Ab>Y@1%>VQIuqf8j1ZG;^g3(dN z-z;_E)+o$h|1B?ywKRd5mbYMZlsN#lRoS;$#yrj6K7Ta4dh%nD9u(bg=vFq6eBHvf zs=Wi~4aWaH_if2zVy$c-`MO0A3u)8J$iwKJJ9okd*FPlYZ(sUB@+d={ekv?ACTPGq z9}DTo3|kr7%Z(2Nh5riXZ(ra{B9AiE>BnW?ZPShyIh@Fv~t0um@Vkm>94}k zbH|){NiQ4^Z=Lx@@&x5I>gg7-{epO#(KmeUf=a$rjzdzI+QfH68Ck=q~nRyQfQ0gr!09pXR@XrK5{w@K)$6@5F z0f6R_ZdyDyfMyH;H<%Wr$A&DsKqdej(TFN8;-oNL@6k6y-QxUxl*@mcYezZjgQ1~7R8EWY$6<2o(+dOu zq|GzGIX7S6KsZ)k055RQ-i5{ZmT}1#G;yc?KM9ABEJ80P!(f}B$V*bk> zZ%F$9IDiFRJ#i!^Mio@5Zm@S_08O~n)zyU*4Ziy9A`x3&AJfp#5K}Ay3Mox%Q`%e% zz)-wTYXD5GIsF)}L9mW#*#K6oSP@b%*wWGxwzjs4kVlz5X4R@y;o7xpMaWwKw)L$c z+huf%GtYAgK$|6i>%R`k{*6DrF3d^?CDo7W6#; z>FWMm41gXJP={lD$IG#wy%IYIbug$U0HVnl_FC z$Kx6s8^fliCK2*F{E@;KrOk3*4}g%Z*Ki=3gHdT^n!Nl=F@QoD>i#a|4{UxefF=cC z-MV!}5rDGE0I+?Yx3kz7;5puo8!V@BniZ3gQP#1Zg(%63TDyrTefTwA&)YB z%<|>S!(1*WLf-c{io3_QriC$~Ozr~tWB^vE6XQ`|cK}ou&{0qkfa%&gIyx#labO?_ z1_vd@=^58uzpY#u1f88@>gyYu;T<^=1cwig?L)c_A_%A^B0vLxc^aLS0MPO< zIa?xN>r;;g2cBOd+O?)G;4?mieTelef2(tiQ%wTE6P~21yk-G()IH(_AewCev`Gs< zcaNF`U|U%Ou;W8bjsX^c9s_K2^tR@lY8pV&U7#ibP%wqiM*7mSc|q^$1x_rVRsd-i zS7r6cv;1B5WQUWbXu3S*?+elb&`W3)0f6}k#I(FG$N~V?67BML*#-!pkWS0{g46(D z-tz%O*#M^ceS!Uc0N)gF@l-FX>*aO5@S$Ijvh_)E0O08>a|kgLmOEw7vPf8Q4%-t~V(fChl~ z1=#d-x!M5q(mB5{@rAz+K3joHk=@%wb1)!4e3(~It<3WiV=L3uYJ}F|W+H5iH z_XTO!|C0ddxk6O|r2W1iY5kvO_42rH{U5W%83Uk_?+dg+tO4rvf0kqYKMBBju5;ka9MAmD+4+9XWzTvhkqAlks}>TpVZ}U>d1%ez zO1g149jHX9CpMg3vq(t-fMBw3?>2gTs>!=TWd(rE*VR;50VI=2pHNm70J!({X~1P= z4?vp52!P~tm=gd@=EDGVr0U8C02|-Da)HWY_16KIR5k$ExD=0!lK&b^)m9J$Q=4il zmD%md#k6&;tMuB1)UeuJ2U065)k26^lmP(8p$_Vz4czB;!}bx80sw7UU8Rh`;EoN| z>dM03`|FobYyC162Ou1SIw<3IB!HlO#H<5Q552`nm*mV zLf;<^s_U2GK^n_kpx+}I8oPE(2{DL89n?i0ZJ|y49k!2%%oK2^!2(JypHENDw$Rw6 zgVd5*s>~yG>>i;Xcdjb)$Rhy?Vi1cusEaman_>Hi=m2nf%pJDX^r)keMlbH8r{|j; zbBE~LogVu2Ame?#{dqb-ANmf{u(Rh!3}R6SbIbtOMX*Z)|$(>JinW z&(7_l>qpWwbZ`p|w$&@M(Cy61Hfi56oBag`62Ou7!lH>jE79-Wg8~IGG^8RVA%5mATK|h0mw32JjcPH%SI&Jdg5%p@cTmwWim#;pBDf&Cr5x4fHVUb z5`f8=1jbXqR3|&sO#nuRIz5A2UQ_@%uK_v$+52+EmH^}$pqZ9Hq&Xb`t|kDgJR39R zufe3F>C0TlcEeCy!^uta0_J@A@o7eI8OaaLE{Q`Z6n*bE_0>pHu zLf