Browse Source

Merge pull request #1394 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'bb502214f3c48bf3ebed45495f9007c667aa9514':
  REPORT-24314 10.0.4启动画面 非中文版提供
feature/big-screen
Hades 5 years ago
parent
commit
7c17013b03
  1. 7
      designer-base/src/main/java/com/fr/design/locale/impl/SplashMark.java
  2. 10
      designer-realize/src/main/java/com/fr/start/common/SplashPane.java
  3. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_10.gif
  4. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_10_en.gif
  5. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_10_en.png
  6. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_10_jp.gif

7
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<String> {
private Map<Locale, String> map = new HashMap<Locale, String>();
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);
}

10
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<String> localeMark = LocaleCenter.getMark(SplashMark.class);
return localeMark.getValue();
}
private NotNullLazyValue<Font> fontValue = new NotNullLazyValue<Font>() {
@NotNull
@Override

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_10.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 MiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_10_en.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 MiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_10_en.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_10_jp.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 MiB

Loading…
Cancel
Save