Browse Source

INO-21074 启动页

persist/11.0-arabic^2
obo 6 months ago
parent
commit
08ac3f909b
  1. 5
      designer-realize/src/main/java/com/fr/start/SplashContext.java
  2. 5
      designer-realize/src/main/java/com/fr/start/common/SplashPane.java

5
designer-realize/src/main/java/com/fr/start/SplashContext.java

@ -1,5 +1,6 @@
package com.fr.start; package com.fr.start;
import com.fr.base.i18n.BidiUtils;
import com.fr.concurrent.NamedThreadFactory; import com.fr.concurrent.NamedThreadFactory;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.constants.DesignerLaunchStatus; import com.fr.design.constants.DesignerLaunchStatus;
@ -106,7 +107,7 @@ public class SplashContext {
public void run() { public void run() {
showThanks(); showThanks();
loadingIndex++; loadingIndex++;
updateModuleLog(moduleId.isEmpty() ? StringUtils.EMPTY : moduleId + loading[loadingIndex % 3]); updateModuleLog(moduleId.isEmpty() ? StringUtils.EMPTY : BidiUtils.concatenateStrings(moduleId, loading[loadingIndex % 3]));
} }
}, 0, 300, TimeUnit.MILLISECONDS); }, 0, 300, TimeUnit.MILLISECONDS);
@ -116,7 +117,7 @@ public class SplashContext {
public void on(Event event, String i18n) { public void on(Event event, String i18n) {
moduleId = i18n; moduleId = i18n;
loadingIndex++; loadingIndex++;
updateModuleLog(moduleId.isEmpty() ? StringUtils.EMPTY : moduleId + loading[loadingIndex % 3]); updateModuleLog(moduleId.isEmpty() ? StringUtils.EMPTY : BidiUtils.concatenateStrings(moduleId, loading[loadingIndex % 3]));
} }
}; };
EventDispatcher.listen(ModuleEvent.MajorModuleStarting, listener); EventDispatcher.listen(ModuleEvent.MajorModuleStarting, listener);

5
designer-realize/src/main/java/com/fr/start/common/SplashPane.java

@ -3,6 +3,7 @@ package com.fr.start.common;
import com.bulenkov.iconloader.IconLoader; import com.bulenkov.iconloader.IconLoader;
import com.bulenkov.iconloader.util.JBUI; import com.bulenkov.iconloader.util.JBUI;
import com.fr.base.GraphHelper; import com.fr.base.GraphHelper;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.general.locale.image.I18nImage; import com.fr.general.locale.image.I18nImage;
import com.fr.stable.GraphDrawHelper; import com.fr.stable.GraphDrawHelper;
@ -46,6 +47,7 @@ public class SplashPane extends JPanel {
private static final String ARIAL_FONT_NAME = "Arial"; private static final String ARIAL_FONT_NAME = "Arial";
private static final String YAHEI_FONT_NAME = "Microsoft YaHei"; private static final String YAHEI_FONT_NAME = "Microsoft YaHei";
private static final String ARABIC_FONT_NAME = "Calibri";
private String thanksLog = StringUtils.EMPTY; private String thanksLog = StringUtils.EMPTY;
private String moduleText = StringUtils.EMPTY; private String moduleText = StringUtils.EMPTY;
@ -74,6 +76,9 @@ public class SplashPane extends JPanel {
if (font == null || isDialogFont(font)) { if (font == null || isDialogFont(font)) {
font = createFont(ARIAL_FONT_NAME); font = createFont(ARIAL_FONT_NAME);
} }
if (BidiUtils.rtl()) {
font = createFont(ARABIC_FONT_NAME);
}
return font; return font;
} }
}; };

Loading…
Cancel
Save