Browse Source

Pull request #11798: REPORT-82787 & REPORT-92430 图表空数据提示配置页面,默认图片需补充繁中版,mac下文件显示补充图标

Merge in DESIGN/design from ~OBO/design:release/11.0 to release/11.0

* commit 'bd3ba069a1b17990f54163b466216e7d1da9cac4':
  REPORT-92430 设计器-图标-mac下文件图标都丢失了,windows下正常
  REPORT-82787 图表空数据提示配置页面,默认图片需补充繁中版
  REPORT-82787 图表空数据提示配置页面,默认图片需补充繁中版
release/11.0
Obo-王学仁 2 years ago committed by Bruce.Deng-邓铖臻
parent
commit
1ca77babd2
  1. 5
      designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java
  2. 7
      designer-chart/src/main/java/com/fr/design/locale/impl/EmptyDataMark.java

5
designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java

@ -1,5 +1,6 @@
package com.fr.design.gui; package com.fr.design.gui;
import com.fr.base.svg.IconUtils;
import com.fr.design.gui.borders.UIFrameBorder; import com.fr.design.gui.borders.UIFrameBorder;
import com.fr.design.gui.borders.UIInternalFrameBorder; import com.fr.design.gui.borders.UIInternalFrameBorder;
import com.fr.design.gui.borders.UITableHeaderBorder; import com.fr.design.gui.borders.UITableHeaderBorder;
@ -160,10 +161,10 @@ public class UILookAndFeel extends MetalLookAndFeel {
table.put("Tree.collapsedIcon", loadIcon("TreePlusIcon.png", this)); table.put("Tree.collapsedIcon", loadIcon("TreePlusIcon.png", this));
table.put("Tree.openIcon", loadIcon("TreeFolderOpenedIcon.png", this)); table.put("Tree.openIcon", loadIcon("TreeFolderOpenedIcon.png", this));
table.put("Tree.closedIcon", loadIcon("TreeFolderClosedIcon.png", this)); table.put("Tree.closedIcon", loadIcon("TreeFolderClosedIcon.png", this));
table.put("Tree.leafIcon", loadIcon("TreeLeafIcon.svg", this)); table.put("Tree.leafIcon", loadIcon("TreeLeafIcon.png", this));
table.put("FileView.directoryIcon", loadIcon("DirectoryIcon.png", this)); table.put("FileView.directoryIcon", loadIcon("DirectoryIcon.png", this));
table.put("FileView.computerIcon", loadIcon("ComputerIcon.png", this)); table.put("FileView.computerIcon", loadIcon("ComputerIcon.png", this));
table.put("FileView.fileIcon", loadIcon("FileIcon.svg", this)); table.put("FileView.fileIcon", IconUtils.readIcon("/com/fr/design/images/lookandfeel/FileIcon.svg"));
table.put("FileView.floppyDriveIcon", loadIcon("FloppyIcon.png", this)); table.put("FileView.floppyDriveIcon", loadIcon("FloppyIcon.png", this));
table.put("FileView.hardDriveIcon", loadIcon("HarddiskIcon.png", this)); table.put("FileView.hardDriveIcon", loadIcon("HarddiskIcon.png", this));
table.put("FileChooser.detailsViewIcon", loadIcon("FileDetailsIcon.png", this)); table.put("FileChooser.detailsViewIcon", loadIcon("FileDetailsIcon.png", this));

7
designer-chart/src/main/java/com/fr/design/locale/impl/EmptyDataMark.java

@ -13,14 +13,14 @@ import java.util.Map;
* 根据本地化信息设置服务器图表空数据提示图标 * 根据本地化信息设置服务器图表空数据提示图标
* *
* @author obo * @author obo
* @version 11.0 * @since 11.0
* Created by obo on 2023/3/22 * Created on 2023/3/22
*/ */
public class EmptyDataMark implements LocaleMark<BufferedImage> { public class EmptyDataMark implements LocaleMark<BufferedImage> {
private Map<Locale, BufferedImage> map = new HashMap<>(); private Map<Locale, BufferedImage> map = new HashMap<>();
private static final BufferedImage ZH_EMPTY_DATA = IOUtils.readImage("com/fr/design/images/zh_emptydata.png"); private static final BufferedImage ZH_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/zh_emptydata.png");
private static final BufferedImage US_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/us_emptydata.png"); private static final BufferedImage US_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/us_emptydata.png");
private static final BufferedImage ZH_TRADITIONAL_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/zh_traditional_emptydata.png"); private static final BufferedImage ZH_TRADITIONAL_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/zh_traditional_emptydata.png");
@ -34,4 +34,5 @@ public class EmptyDataMark implements LocaleMark<BufferedImage> {
BufferedImage result = map.get(GeneralContext.getLocale()); BufferedImage result = map.get(GeneralContext.getLocale());
return result == null ? US_EMPTY_DATA : result; return result == null ? US_EMPTY_DATA : result;
} }
} }

Loading…
Cancel
Save