Browse Source

REPORT-92757 【国际化】FR海外版本去除中文

feature/x
obo 2 years ago
parent
commit
8f4901fe51
  1. 25
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java
  2. 5
      designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java
  3. BIN
      designer-base/src/main/resources/com/fr/design/images/mainframe/loading/loading.gif
  4. BIN
      designer-base/src/main/resources/com/fr/design/images/mainframe/loading/loading_en.gif
  5. BIN
      designer-base/src/main/resources/com/fr/design/images/mainframe/loading/loading_zh.gif
  6. BIN
      designer-base/src/main/resources/com/fr/design/images/mainframe/loading/loading_zh_TW.gif
  7. 57
      designer-base/src/main/resources/com/fr/design/login/guide.css
  8. 2
      designer-base/src/main/resources/com/fr/design/login/guide.html
  9. BIN
      designer-base/src/main/resources/com/fr/design/login/img/guide/login_guide_en_US.png
  10. 0
      designer-base/src/main/resources/com/fr/design/login/img/guide/login_guide_zh_CN.png
  11. BIN
      designer-base/src/main/resources/com/fr/design/login/img/guide/login_guide_zh_TW.png
  12. 57
      designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_en_US.css
  13. 57
      designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_ja_JP.css
  14. 57
      designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_ko_KR.css
  15. 57
      designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_zh_CN.css
  16. 57
      designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_zh_TW.css
  17. 4
      designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
  18. 17
      designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
  19. 0
      designer-chart/src/main/resources/com/fr/design/images/emptydata/emptydata.png
  20. BIN
      designer-chart/src/main/resources/com/fr/design/images/emptydata/emptydata_en.png
  21. 0
      designer-chart/src/main/resources/com/fr/design/images/emptydata/emptydata_zh.png
  22. 0
      designer-chart/src/main/resources/com/fr/design/images/emptydata/emptydata_zh_TW.png
  23. BIN
      designer-chart/src/main/resources/com/fr/van/chart/background/background.png
  24. BIN
      designer-chart/src/main/resources/com/fr/van/chart/background/background_en.png
  25. 0
      designer-chart/src/main/resources/com/fr/van/chart/background/background_zh.png
  26. BIN
      designer-chart/src/main/resources/com/fr/van/chart/background/background_zh_TW.png
  27. 11
      designer-form/src/main/java/com/fr/design/designer/creator/XAutoChartCreator.java
  28. BIN
      designer-form/src/main/resources/com/fr/design/form/images/autochartpreview/auto_chart_preview.png
  29. BIN
      designer-form/src/main/resources/com/fr/design/form/images/autochartpreview/auto_chart_preview_en.png
  30. BIN
      designer-form/src/main/resources/com/fr/design/form/images/autochartpreview/auto_chart_preview_zh.png
  31. BIN
      designer-form/src/main/resources/com/fr/design/form/images/autochartpreview/auto_chart_preview_zh_TW.png
  32. 12
      designer-realize/src/main/java/com/fr/start/SplashContext.java
  33. 12
      designer-realize/src/main/java/com/fr/start/common/SplashPane.java
  34. 20
      designer-realize/src/main/java/com/fr/start/common/SplashPane4WinAndJDK11.java
  35. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash.png
  36. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x.png
  37. 0
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png
  38. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png
  39. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png
  40. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_zh.png
  41. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png
  42. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open/open.png
  43. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open/open_en.png
  44. 0
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open/open_zh.png
  45. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open/open_zh_TW.png
  46. 0
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind/remind.png
  47. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind/remind_en.png
  48. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind/remind_zh.png
  49. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind/remind_zh_TW.png

25
designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java

@ -4,10 +4,21 @@ import com.fr.design.dialog.UIDialog;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.general.IOUtils;
import javax.swing.*;
import java.awt.*;
import com.fr.general.locale.image.LocaleImageFactory;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JComponent;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.LayoutManager;
import java.awt.Rectangle;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@ -23,8 +34,10 @@ public class RemindPane extends JPanel {
private Icon checkIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/check.png");
private Icon unCheckIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/uncheck.png");
private Icon closeIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/remind_close.png");
private Icon labelIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/remind.png");
private Icon openIcon = IOUtils.readIcon("com/fr/design/mainframe/alphafine/images/open.png");
private static final String REMIND_IMAGE_URL = "/com/fr/design/mainframe/alphafine/images/open/open.png";
private Icon labelIcon = new ImageIcon(LocaleImageFactory.createLocaleMark(REMIND_IMAGE_URL).getValue());
private static final String OPEN_IMAGE_URL = "/com/fr/design/mainframe/alphafine/images/open/open.png";
private final Icon openIcon = new ImageIcon(LocaleImageFactory.createLocaleMark(OPEN_IMAGE_URL).getValue());
private static final int WIDTH = 600;
private static final int HEIGHT = 400;

5
designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java

@ -11,6 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.theme.dialog.TemplateThemeProfileDialog;
import com.fr.general.IOUtils;
import com.fr.general.locale.image.LocaleImageFactory;
import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
@ -26,7 +27,6 @@ import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.Toolkit;
import java.awt.Window;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@ -209,7 +209,8 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
}
private static class ThumbnailPane extends JPanel {
private static final Image LOADING_IMAGE = Toolkit.getDefaultToolkit().createImage(ThumbnailPane.class.getResource("/com/fr/design/images/mainframe/loading.gif"));
private static final String LOADING_IMAGE_URL = "/com/fr/design/images/mainframe/loading/loading.gif";
private static final Image LOADING_IMAGE = LocaleImageFactory.createLocaleMark(LOADING_IMAGE_URL).getValue();
private Image thumbnail = null;
@Override

BIN
designer-base/src/main/resources/com/fr/design/images/mainframe/loading/loading.gif

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
designer-base/src/main/resources/com/fr/design/images/mainframe/loading/loading_en.gif

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
designer-base/src/main/resources/com/fr/design/images/mainframe/loading/loading_zh.gif

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
designer-base/src/main/resources/com/fr/design/images/mainframe/loading/loading_zh_TW.gif

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

57
designer-base/src/main/resources/com/fr/design/login/guide.css

@ -1,57 +0,0 @@
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
background: url(./img/icon_install_normal.png) no-repeat center center;
background-size: cover;
width: 20px;
height: 20px;
cursor: pointer;
}
.background-guide-close:hover {
background-color: #E8E8E9;
}
.background-login-loading {
background: url(./img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(./img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(./img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(./img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(./img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(./img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(./img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(./img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(./img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(./img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-guide {
background: url(./img/login_guide.png) no-repeat center center;
background-size: cover;
}
.designer-guide-login-button {
font-size: 14px;
color: white;
border-radius: 4px;
background-color: #3685F2;
}

2
designer-base/src/main/resources/com/fr/design/login/guide.html

@ -15,7 +15,7 @@
<link rel="stylesheet" type="text/css" href="lib/bundle.css"/>
<script type="text/javascript" charset="UTF-8" src="lib/locale/login_zh_CN.js?_=compatible"></script>
<script type="text/javascript" charset="UTF-8" src="lib/locale/login_${language}.js"></script><script type="text/javascript" charset="UTF-8" src="lib/fineui.min.js"></script>
<link href="guide.css" rel="stylesheet"></head>
<link href="lib/locale/guide/guide_${language}.css" rel="stylesheet"></head>
</html>
<script type="text/javascript">
if (!/macintosh|mac os x/i.test(navigator.userAgent.toLowerCase())) {

BIN
designer-base/src/main/resources/com/fr/design/login/img/guide/login_guide_en_US.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 459 KiB

0
designer-base/src/main/resources/com/fr/design/login/img/login_guide.png → designer-base/src/main/resources/com/fr/design/login/img/guide/login_guide_zh_CN.png

Before

Width:  |  Height:  |  Size: 473 KiB

After

Width:  |  Height:  |  Size: 473 KiB

BIN
designer-base/src/main/resources/com/fr/design/login/img/guide/login_guide_zh_TW.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 KiB

57
designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_en_US.css

@ -0,0 +1,57 @@
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
background: url(../../../img/icon_install_normal.png) no-repeat center center;
background-size: cover;
width: 20px;
height: 20px;
cursor: pointer;
}
.background-guide-close:hover {
background-color: #E8E8E9;
}
.background-login-loading {
background: url(../../../img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(../../../img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(../../../img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(../../../img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(../../../img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(../../../img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(../../../img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(../../../img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(../../../img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-guide {
background: url(../../../img/guide/login_guide_en_US.png) no-repeat center center;
background-size: cover;
}
.designer-guide-login-button {
font-size: 14px;
color: white;
border-radius: 4px;
background-color: #3685F2;
}

57
designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_ja_JP.css

@ -0,0 +1,57 @@
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
background: url(../../../img/icon_install_normal.png) no-repeat center center;
background-size: cover;
width: 20px;
height: 20px;
cursor: pointer;
}
.background-guide-close:hover {
background-color: #E8E8E9;
}
.background-login-loading {
background: url(../../../img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(../../../img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(../../../img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(../../../img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(../../../img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(../../../img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(../../../img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(../../../img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(../../../img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-guide {
background: url(../../../img/guide/login_guide_en_US.png) no-repeat center center;
background-size: cover;
}
.designer-guide-login-button {
font-size: 14px;
color: white;
border-radius: 4px;
background-color: #3685F2;
}

57
designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_ko_KR.css

@ -0,0 +1,57 @@
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
background: url(../../../img/icon_install_normal.png) no-repeat center center;
background-size: cover;
width: 20px;
height: 20px;
cursor: pointer;
}
.background-guide-close:hover {
background-color: #E8E8E9;
}
.background-login-loading {
background: url(../../../img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(../../../img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(../../../img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(../../../img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(../../../img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(../../../img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(../../../img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(../../../img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(../../../img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-guide {
background: url(../../../img/guide/login_guide_en_US.png) no-repeat center center;
background-size: cover;
}
.designer-guide-login-button {
font-size: 14px;
color: white;
border-radius: 4px;
background-color: #3685F2;
}

57
designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_zh_CN.css

@ -0,0 +1,57 @@
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
background: url(../../../img/icon_install_normal.png) no-repeat center center;
background-size: cover;
width: 20px;
height: 20px;
cursor: pointer;
}
.background-guide-close:hover {
background-color: #E8E8E9;
}
.background-login-loading {
background: url(../../../img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(../../../img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(../../../img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(../../../img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(../../../img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(../../../img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(../../../img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(../../../img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(../../../img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-guide {
background: url(../../../img/guide/login_guide_zh_CN.png) no-repeat center center;
background-size: cover;
}
.designer-guide-login-button {
font-size: 14px;
color: white;
border-radius: 4px;
background-color: #3685F2;
}

57
designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_zh_TW.css

@ -0,0 +1,57 @@
.background-login-close {
color: white !important;
font-weight: bold;
font-size: 14px;
}
.background-guide-close {
background: url(../../../img/icon_install_normal.png) no-repeat center center;
background-size: cover;
width: 20px;
height: 20px;
cursor: pointer;
}
.background-guide-close:hover {
background-color: #E8E8E9;
}
.background-login-loading {
background: url(../../../img/login_loading.gif) no-repeat center center;
}
.background-plugin-need-update {
background: url(../../../img/icon_new.png) no-repeat center center;
}
.background-plugin-cant-use {
background: url(../../../img/icon_cantuse.png) no-repeat center center;
}
.background-plugin-is-disable {
background: url(../../../img/icon_disable.png) no-repeat center center;
}
.background-plugin-is-disable-new {
background: url(../../../img/icon_disable-new.png) no-repeat center center;
}
.background-plugin-selected {
background: url(../../../img/icon_marked.png) no-repeat center center;
}
.background-shop-title-close {
background: url(../../../img/icon_close40x40_normal.svg) no-repeat center center;
}
.background-dialog-confirm {
background: url(../../../img/warning.png) no-repeat center center;
background-size: contain;
}
.background-close-button {
background: url(../../../img/icon_close9x9_normal.png) no-repeat center center;
}
.background-close-button:hover {
background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
}
.designer-login-guide {
background: url(../../../img/guide/login_guide_zh_TW.png) no-repeat center center;
background-size: cover;
}
.designer-guide-login-button {
font-size: 14px;
color: white;
border-radius: 4px;
background-color: #3685F2;
}

4
designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java

@ -61,10 +61,10 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
private Image emptyDataImage = DEFAULT_EMPTY_DATA_IMAGE;
private SwingWorker<Void, Void> imageWorker;
private static final String EMPTY_DATA_IMAGE_PATH = "/com/fr/design/images/emptydata.png";
private static final String EMPTY_DATA_IMAGE_PATH = "/com/fr/design/images/emptydata/emptydata.png";
static {
LocaleImageMark localeImageMark = LocaleImageFactory.getOrCreateLocaleMark(EMPTY_DATA_IMAGE_PATH);
LocaleImageMark localeImageMark = LocaleImageFactory.createLocaleMark(EMPTY_DATA_IMAGE_PATH);
DEFAULT_EMPTY_DATA_IMAGE = localeImageMark.getValue();
}

17
designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java

@ -12,6 +12,7 @@ import com.fr.general.CloudCenter;
import com.fr.general.IOUtils;
import com.fr.general.SiteBlockedException;
import com.fr.general.http.HttpClient;
import com.fr.general.locale.image.LocaleImageFactory;
import com.fr.plugin.chart.DownloadSourcesEvent;
import com.fr.stable.CommonUtils;
import com.fr.stable.StableUtils;
@ -23,20 +24,20 @@ import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.ArrayList;
import java.util.List;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Rectangle;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import static com.fr.design.dialog.FineJOptionPane.OPTION_OK_CANCEL;
@ -65,7 +66,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
private double totalBytes = 0;
private static final double MAP_JSON_MB = 4.5 * 1024 * 1024;
private static final String BACKGROUND_IMAGE_URL = "com/fr/van/chart/background/background.png";
public void addMapJSONSiteInfo() {
this.addSiteInfo("map10.json", ChartConstants.MAP_JSON_URL, MAP_JSON_MB);
}
@ -189,7 +190,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
private void initDialog() {
// 创建标签,并在标签上放置一张图片
BufferedImage image = IOUtils.readImage("/com/fr/van/chart/background.png");
BufferedImage image = LocaleImageFactory.createLocaleMark(BACKGROUND_IMAGE_URL).getValue();
ImageIcon imageIcon = new ImageIcon(image);
UILabel label = new UILabel(imageIcon);
label.setBounds(0, 0, LOAD_WIDTH, LOAD_HEIGHT);

0
designer-chart/src/main/resources/com/fr/design/images/en_us_emptydata.png → designer-chart/src/main/resources/com/fr/design/images/emptydata/emptydata.png

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
designer-chart/src/main/resources/com/fr/design/images/emptydata/emptydata_en.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

0
designer-chart/src/main/resources/com/fr/design/images/zh_cn_emptydata.png → designer-chart/src/main/resources/com/fr/design/images/emptydata/emptydata_zh.png

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

0
designer-chart/src/main/resources/com/fr/design/images/zh_tw_emptydata.png → designer-chart/src/main/resources/com/fr/design/images/emptydata/emptydata_zh_TW.png

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
designer-chart/src/main/resources/com/fr/van/chart/background/background.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

BIN
designer-chart/src/main/resources/com/fr/van/chart/background/background_en.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

0
designer-chart/src/main/resources/com/fr/van/chart/background.png → designer-chart/src/main/resources/com/fr/van/chart/background/background_zh.png

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 105 KiB

BIN
designer-chart/src/main/resources/com/fr/van/chart/background/background_zh_TW.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

11
designer-form/src/main/java/com/fr/design/designer/creator/XAutoChartCreator.java

@ -12,13 +12,15 @@ import com.fr.design.mainframe.EditingMouseListener;
import com.fr.design.mainframe.FormDesigner;
import com.fr.design.module.DesignModuleFactory;
import com.fr.form.ui.ChartAutoEditor;
import com.fr.general.IOUtils;
import com.fr.general.locale.image.LocaleImageFactory;
import com.fr.general.locale.image.LocaleImageMark;
import com.fr.stable.Constants;
import com.fr.stable.bridge.StableFactory;
import javax.swing.JComponent;
import javax.swing.JPanel;
import java.awt.*;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
@ -38,6 +40,8 @@ public class XAutoChartCreator extends XChartEditor {
super(editor, size);
}
private static final String AUTO_CHART_IMAGE_PATH = "com/fr/design/form/images/autochartpreview/auto_chart_preview.png";
/**
* 返回组件默认名
*
@ -103,7 +107,8 @@ public class XAutoChartCreator extends XChartEditor {
@Override
public void paintForeground(Graphics2D g) {
BufferedImage bufferedImage = IOUtils.readImage("com/fr/design/form/images/auto_chart_preview.png");
LocaleImageMark localeImageMark = LocaleImageFactory.createLocaleMark(AUTO_CHART_IMAGE_PATH);
BufferedImage bufferedImage = localeImageMark.getValue();;
GraphHelper.paintImage(
g, this.getWidth(), this.getHeight(), bufferedImage,
Constants.IMAGE_ADJUST,

BIN
designer-form/src/main/resources/com/fr/design/form/images/autochartpreview/auto_chart_preview.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
designer-form/src/main/resources/com/fr/design/form/images/autochartpreview/auto_chart_preview_en.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
designer-form/src/main/resources/com/fr/design/form/images/autochartpreview/auto_chart_preview_zh.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
designer-form/src/main/resources/com/fr/design/form/images/autochartpreview/auto_chart_preview_zh_TW.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

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

@ -2,14 +2,12 @@ package com.fr.start;
import com.fr.concurrent.NamedThreadFactory;
import com.fr.design.i18n.Toolkit;
import com.fr.design.locale.impl.SplashMark;
import com.fr.design.mainframe.bbs.BBSConstants;
import com.fr.event.Event;
import com.fr.event.EventDispatcher;
import com.fr.event.Listener;
import com.fr.general.GeneralContext;
import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
import com.fr.general.locale.image.LocaleImageFactory;
import com.fr.module.ModuleEvent;
import com.fr.stable.StringUtils;
@ -44,6 +42,11 @@ public class SplashContext {
private String guest = StringUtils.EMPTY;
private boolean hasShowThanks = false;
/**
* 正常图片路径
*/
private static final String SPLASH_IMAGE_PATH = "/com/fr/design/images/splash.png";
private ScheduledExecutorService scheduler = Executors
.newScheduledThreadPool(1, new NamedThreadFactory("SplashContext"));
@ -174,7 +177,6 @@ public class SplashContext {
}
private static String getSplashPath() {
LocaleMark<String> localeMark = LocaleCenter.getMark(SplashMark.class);
return localeMark.getValue();
return LocaleImageFactory.createLocaleMark(SPLASH_IMAGE_PATH).getImagePath();
}
}

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

@ -3,9 +3,7 @@ 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.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
import com.fr.general.locale.image.LocaleImageFactory;
import com.fr.stable.GraphDrawHelper;
import com.fr.stable.GraphicsConfig;
import com.fr.stable.StringUtils;
@ -51,13 +49,17 @@ public class SplashPane extends JPanel {
private String thanksLog = StringUtils.EMPTY;
private String moduleText = StringUtils.EMPTY;
/**
* 正常图片路径
*/
private static final String SPLASH_PATH = "/com/fr/design/images/splash.png";
private static int uiScale(int i) {
return (int) (i * JBUI_INIT_SCALE);
}
private static String getSplashPath() {
LocaleMark<String> localeMark = LocaleCenter.getMark(SplashMark.class);
return localeMark.getValue();
return LocaleImageFactory.createLocaleMark(SPLASH_PATH).getImagePath();
}
private NotNullLazyValue<Font> fontValue = new NotNullLazyValue<Font>() {

20
designer-realize/src/main/java/com/fr/start/common/SplashPane4WinAndJDK11.java

@ -2,16 +2,14 @@ package com.fr.start.common;
import com.bulenkov.iconloader.IconLoader;
import com.fr.base.BaseUtils;
import com.fr.design.locale.impl.DoubleSplashMark;
import com.fr.design.locale.impl.SplashMark;
import com.fr.general.IOUtils;
import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.image.LocaleImageFactory;
import java.awt.RenderingHints;
import javax.swing.Icon;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
/**
@ -30,13 +28,23 @@ public class SplashPane4WinAndJDK11 extends SplashPane{
*/
private boolean isDouble = false;
/**
* 正常图片路径
*/
private static final String SPLASH_PATH = "/com/fr/design/images/splash.png";
/**
* 两倍图片路径
*/
private static final String DOUBLE_SPLASH_PATH = "/com/fr/design/images/splash@2x.png";
public SplashPane4WinAndJDK11() {
this.imagePath = getSplashPath4WinAndJdk11();
}
private String getSplashPath4WinAndJdk11() {
String path = (String) LocaleCenter.getMark(SplashMark.class).getValue();
String pathOfDouble = (String) LocaleCenter.getMark(DoubleSplashMark.class).getValue();
String path = LocaleImageFactory.createLocaleMark(SPLASH_PATH).getImagePath();
String pathOfDouble = LocaleImageFactory.createLocaleMark(DOUBLE_SPLASH_PATH).getImagePath();
// 为图片加上"@2x"
// 某些定制jar里面没有两倍图,判断一下,如果文件不存在,就返回一倍图的path
if (IOUtils.readResource(pathOfDouble) != null) {

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 KiB

After

Width:  |  Height:  |  Size: 298 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 946 KiB

After

Width:  |  Height:  |  Size: 949 KiB

0
designer-realize/src/main/resources/com/fr/design/images/splash_en@2x.png → designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png

Before

Width:  |  Height:  |  Size: 949 KiB

After

Width:  |  Height:  |  Size: 949 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 564 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open/open.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open/open_en.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

0
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open.png → designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open/open_zh.png

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open/open_zh_TW.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

0
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind.png → designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind/remind.png

Before

Width:  |  Height:  |  Size: 161 KiB

After

Width:  |  Height:  |  Size: 161 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind/remind_en.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 352 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind/remind_zh.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind/remind_zh_TW.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 364 KiB

Loading…
Cancel
Save