diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java b/designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java index 790108978..8cf75c058 100644 --- a/designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java +++ b/designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java @@ -15,14 +15,13 @@ import java.util.Map; public class SplashMark implements LocaleMark { private Map map = new HashMap(); - private static final String SPLASH_PATH = "/com/fr/design/images/splash_10.gif"; - private static final String SPLASH_EN_PATH = "/com/fr/design/images/splash_10_en.gif"; - private static final String SPLASH_JP_PATH = "/com/fr/design/images/splash_10_jp.gif"; + private static final String SPLASH_PATH = "/com/fr/design/images/splash_10.png"; + private static final String SPLASH_EN_PATH = "/com/fr/design/images/splash_10_en.png"; public SplashMark() { map.put(Locale.CHINA, SPLASH_PATH); map.put(Locale.KOREA, SPLASH_EN_PATH); - map.put(Locale.JAPAN, SPLASH_JP_PATH); + map.put(Locale.JAPAN, SPLASH_EN_PATH); map.put(Locale.US, SPLASH_EN_PATH); map.put(Locale.TAIWAN, SPLASH_EN_PATH); } diff --git a/designer-realize/src/main/java/com/fr/start/common/SplashPane.java b/designer-realize/src/main/java/com/fr/start/common/SplashPane.java index 6220f13f2..726bdaba4 100644 --- a/designer-realize/src/main/java/com/fr/start/common/SplashPane.java +++ b/designer-realize/src/main/java/com/fr/start/common/SplashPane.java @@ -3,7 +3,10 @@ package com.fr.start.common; import com.bulenkov.iconloader.IconLoader; import com.bulenkov.iconloader.util.JBUI; import com.fr.base.GraphHelper; +import com.fr.design.locale.impl.SplashMark; import com.fr.design.ui.util.GraphicsConfig; +import com.fr.general.locale.LocaleCenter; +import com.fr.general.locale.LocaleMark; import com.fr.stable.GraphDrawHelper; import com.fr.stable.StringUtils; import com.fr.stable.os.OperatingSystem; @@ -23,7 +26,7 @@ import java.util.Locale; */ public class SplashPane extends JPanel { - private static String OEM_PATH = "/com/fr/design/images/splash_10.png"; + private static String OEM_PATH = getSplashPath(); private static float JBUI_INIT_SCALE = JBUI.scale(1f); private static final Color MODULE_COLOR = new Color(255, 255, 255); @@ -47,6 +50,11 @@ public class SplashPane extends JPanel { return (int) (i * JBUI_INIT_SCALE); } + private static String getSplashPath() { + LocaleMark localeMark = LocaleCenter.getMark(SplashMark.class); + return localeMark.getValue(); + } + private NotNullLazyValue fontValue = new NotNullLazyValue() { @NotNull @Override diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash_10.gif b/designer-realize/src/main/resources/com/fr/design/images/splash_10.gif deleted file mode 100644 index 36b362649..000000000 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash_10.gif and /dev/null differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash_10_en.gif b/designer-realize/src/main/resources/com/fr/design/images/splash_10_en.gif deleted file mode 100644 index 00b98250d..000000000 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash_10_en.gif and /dev/null differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash_10_en.png b/designer-realize/src/main/resources/com/fr/design/images/splash_10_en.png new file mode 100644 index 000000000..db254316f Binary files /dev/null and b/designer-realize/src/main/resources/com/fr/design/images/splash_10_en.png differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash_10_jp.gif b/designer-realize/src/main/resources/com/fr/design/images/splash_10_jp.gif deleted file mode 100644 index 860963c95..000000000 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash_10_jp.gif and /dev/null differ