diff --git a/build.gradle b/build.gradle index 10f37cc525..8e2d942e48 100644 --- a/build.gradle +++ b/build.gradle @@ -114,8 +114,8 @@ allprojects { implementation 'org.swingexplorer:swexpl:2.0.1' implementation 'org.swingexplorer:swag:1.0' implementation 'net.java.dev.jna:jna:5.4.0' - implementation 'org.apache.tomcat:tomcat-catalina:8.5.72' - implementation 'org.apache.tomcat:tomcat-websocket:8.5.72' + implementation 'org.apache.tomcat:tomcat-catalina:8.5.93' + implementation 'org.apache.tomcat:tomcat-websocket:8.5.93' implementation 'io.socket:socket.io-client:0.7.0' implementation('com.fr.third:fine-third:' + frVersion) { exclude group: "com.fr.cbb", module: "fine-cbb" } implementation 'com.fr.core:fine-core:' + frDevVersion @@ -128,7 +128,11 @@ allprojects { implementation 'com.fr.report:engine-chart:' + frDevVersion implementation 'com.fr.report:engine-i18n:' + frDevVersion implementation 'com.fr.design:design-i18n:' + frDevVersion + implementation 'com.github.weisj:jsvg:1.2.0' + implementation 'com.formdev:flatlaf:3.4' + implementation 'com.formdev:flatlaf-extras:3.4' implementation 'com.fine.swing.ui:layout:1.0-SNAPSHOT' + implementation 'com.fanruan.vito:gui-inspector:1.0.2' testImplementation 'org.easymock:easymock:3.5.1' testImplementation 'org.powermock:powermock-module-junit4:1.7.1' testImplementation 'org.powermock:powermock-api-easymock:1.7.1' @@ -140,6 +144,7 @@ allprojects { if (OperatingSystem.current().isMacOsX() && "aarch64".equals(System.getProperty("os.arch"))) { dependencies { // jxbrowser 6.23不支持M1，因此没有本地库，但是6.23jar还是需要留着，用来兼容 + implementation 'com.fr.third:jxbrowser-mac:6.23' implementation "com.fr.third:jxbrowser-mac-arm-v7:${jxBrowserVersion}" } } else if (OperatingSystem.current().isMacOsX()) { diff --git a/designer-base/build.base.gradle b/designer-base/build.base.gradle index 094d45d9a6..5ad2f5394b 100644 --- a/designer-base/build.base.gradle +++ b/designer-base/build.base.gradle @@ -59,12 +59,12 @@ def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) //声明外部依赖 dependencies{ - compile fileTree(dir:"../${baseDir}/lib-other",include:'**/*.jar') - compile fileTree(dir:"../${baseDir}/lib-core",include:'**/*.jar') - compile fileTree(dir:"../${baseDir}/lib-design",include:'**/*.jar') - compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar") - compile group: 'io.socket', name: 'socket.io-client', version: '0.7.0' - testCompile 'junit:junit:4.12' + api fileTree(dir:"../${baseDir}/lib-other",include:'**/*.jar') + api fileTree(dir:"../${baseDir}/lib-core",include:'**/*.jar') + api fileTree(dir:"../${baseDir}/lib-design",include:'**/*.jar') + api fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar") + api group: 'io.socket', name: 'socket.io-client', version: '0.7.0' + testImplementation 'junit:junit:4.12' } //输出依赖报 diff --git a/designer-base/src/main/java/com/fine/theme/icon/AbstractIconSet.java b/designer-base/src/main/java/com/fine/theme/icon/AbstractIconSet.java new file mode 100644 index 0000000000..008779ca71 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/AbstractIconSet.java @@ -0,0 +1,68 @@ +package com.fine.theme.icon; + +import com.fr.essential.errorprone.annotations.Immutable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.Icon; +import java.awt.Dimension; +import java.util.Collection; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 抽象图标集 + * + * @author vito + * @since 11.0 + * Created on 2023/11/15 + */ +@Immutable +public abstract class AbstractIconSet implements IconSet { + + protected String name; + protected boolean dark; + + private final Map> iconSourceMap = new ConcurrentHashMap<>(64); + private final Map iconCache = new ConcurrentHashMap<>(64); + + public AbstractIconSet() { + } + + @Override + public @NotNull String getId() { + return name; + } + + @Override + public @NotNull Collection getIds() { + return iconSourceMap.keySet(); + } + + @Override + public void addIcon(@NotNull IconSource icon) { + iconSourceMap.put(icon.getId(), icon); + } + + @SafeVarargs + @Override + public final void addIcon(@NotNull IconSource... icons) { + for (IconSource icon : icons) { + iconSourceMap.put(icon.getId(), icon); + } + } + + @Override + public @Nullable Icon findIcon(@NotNull String id, @NotNull Dimension dimension, IconType type) { + String cacheKey = IconManager.genCacheKey(id, dimension, type); + Icon icon = iconCache.get(cacheKey); + if (icon == null) { + IconSource iconSource = iconSourceMap.get(id); + if (iconSource != null) { + icon = iconSource.loadIcon(dimension, type); + iconCache.put(cacheKey, icon); + } + } + return icon; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/AbstractIconSource.java b/designer-base/src/main/java/com/fine/theme/icon/AbstractIconSource.java new file mode 100644 index 0000000000..2ced39c685 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/AbstractIconSource.java @@ -0,0 +1,109 @@ +package com.fine.theme.icon; + +import com.fr.third.errorprone.annotations.Immutable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.Icon; +import java.awt.Dimension; + + +/** + * 抽象图标源 + *

+ * 1. 记录图标来源的所有信息 + * 2. 如果使用来源提供灰化和反白图标，source负责提供图标的不同来源 + * 3. 默认查找命名，如图标名称为 path/pic.svg,根据以下规则自动查询灰化和反白图标 + * 1). 灰化图 path/pic_disable.svg + * 2). 反白图 path/pic_white.svg + * + * @author vito + * @since 11.0 + * Created on 2023/11/14 + */ +@Immutable +public abstract class AbstractIconSource implements IconSource { + + protected String id; + + protected final IconResource resource; + + @Nullable + protected IconResource grayResource; + + @Nullable + protected IconResource whiteResource; + + + public AbstractIconSource(@NotNull final String id, @NotNull final IconResource resource) { + this.id = id; + this.resource = resource; + } + + + public AbstractIconSource(@NotNull final String id, + @NotNull final IconResource resource, + @Nullable final IconResource grayResource, + @Nullable final IconResource whiteResource) { + this.id = id; + this.resource = resource; + this.grayResource = grayResource; + this.whiteResource = whiteResource; + } + + @NotNull + @Override + public String getId() { + return id; + } + + @NotNull + @Override + public IconResource getResource() { + return resource; + } + + @NotNull + @Override + public I loadIcon(Dimension dimension, IconType type) { + try { + switch (type) { + case disable: + return loadDisabledIcon(dimension); + case white: + return white(dimension); + default: + return loadIcon(resource, dimension, type); + } + + } catch (final Exception e) { + throw new IconException("Unable to load Icon: " + getId(), e); + } + } + + @NotNull + protected abstract I loadIcon(@NotNull IconResource resource, Dimension dimension, IconType type); + + + /** + * 先找提供明确URL的灰化图， + * 再找指定自动寻找路径的灰化图， + * 最后再由具体图标提供默认灰化图 + * + * @return 灰化图 + */ + private @NotNull I loadDisabledIcon(Dimension dimension) { + if (grayResource != null) { + return loadIcon(grayResource, dimension, IconType.normal); + } + return loadIcon(resource, dimension, IconType.disable); + } + + private @NotNull I white(Dimension dimension) { + if (whiteResource != null) { + return loadIcon(whiteResource, dimension, IconType.normal); + } + return loadIcon(resource, dimension, IconType.white); + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/DisabledIcon.java b/designer-base/src/main/java/com/fine/theme/icon/DisabledIcon.java new file mode 100644 index 0000000000..242b49b4b7 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/DisabledIcon.java @@ -0,0 +1,23 @@ +package com.fine.theme.icon; + +import org.jetbrains.annotations.NotNull; + +import javax.swing.Icon; + +/** + * 创建一个灰化 Icon + * + * @author vito + * @since 11.0 + * Created on 2023/11/16 + */ +public interface DisabledIcon { + + /** + * 创建一份灰化图标 + * + * @return 灰化图标 + */ + @NotNull + Icon disabled(); +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/GraphicsFilter.java b/designer-base/src/main/java/com/fine/theme/icon/GraphicsFilter.java new file mode 100644 index 0000000000..f35c1b67f8 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/GraphicsFilter.java @@ -0,0 +1,59 @@ +package com.fine.theme.icon; + +import com.formdev.flatlaf.util.Graphics2DProxy; + +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Paint; +import java.awt.image.RGBImageFilter; + +/** + * 颜色过滤器画板 + * + * @author vito + * @since 11.0 + * Created on 2023/11/21 + */ +public class GraphicsFilter + extends Graphics2DProxy { + private final RGBImageFilter grayFilter; + + public GraphicsFilter(Graphics2D delegate, RGBImageFilter grayFilter) { + super(delegate); + this.grayFilter = grayFilter; + } + + @Override + public Graphics create() { + return new GraphicsFilter((Graphics2D) super.create(), grayFilter); + } + + @Override + public Graphics create(int x, int y, int width, int height) { + return new GraphicsFilter((Graphics2D) super.create(x, y, width, height), grayFilter); + } + + @Override + public void setColor(Color c) { + super.setColor(filterColor(c)); + } + + @Override + public void setPaint(Paint paint) { + if (paint instanceof Color) { + paint = filterColor((Color) paint); + } + super.setPaint(paint); + } + + private Color filterColor(Color color) { + + if (grayFilter != null) { + int oldRGB = color.getRGB(); + int newRGB = grayFilter.filterRGB(0, 0, oldRGB); + color = (newRGB != oldRGB) ? new Color(newRGB, true) : color; + } + return color; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/IconException.java b/designer-base/src/main/java/com/fine/theme/icon/IconException.java new file mode 100644 index 0000000000..58087fb7b0 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/IconException.java @@ -0,0 +1,29 @@ +package com.fine.theme.icon; + +/** + * 图标异常 + * + * @author vito + * @since 11.0 + * Created on 2023/11/6 + */ +public class IconException extends RuntimeException { + public IconException() { + } + + public IconException(String message) { + super(message); + } + + public IconException(String message, Throwable cause) { + super(message, cause); + } + + public IconException(Throwable cause) { + super(cause); + } + + public IconException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/IconManager.java b/designer-base/src/main/java/com/fine/theme/icon/IconManager.java new file mode 100644 index 0000000000..aa2ef8b173 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/IconManager.java @@ -0,0 +1,179 @@ +package com.fine.theme.icon; + +import com.fr.base.extension.FileExtension; +import com.fr.general.IOUtils; +import com.fr.log.FineLoggerFactory; +import com.fr.third.errorprone.annotations.Immutable; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.Icon; +import java.awt.Dimension; +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.HashMap; + +/** + * 图标管理器 + * 1. 提供注册管理图标集，方便整体替换 + * 2. 提供图标缓存 + * 3. 查找图标 + * 4. 配合 {@link LazyIcon} 实现图标懒加载 + * + * @author vito + * @since 11.0 + * Created on 2023/9/12 + */ +@Immutable +public class IconManager { + + public static final String ICON_DISABLE_SUFFIX = "_disable"; + public static final Dimension DEFAULT_DIMENSION = new Dimension(16, 16); + private static final ArrayList ICON_SETS = new ArrayList<>(2); + private static final HashMap> CACHE = new HashMap<>(64); + + + /** + * 获取图标集 + * + * @param id 图标集ID + * @return 图标集 + */ + public static IconSet getSet(String id) { + for (IconSet set : ICON_SETS) { + if (set.getId().equals(id)) { + return set; + } + } + throw new IconException("[IconManager] Can not find icon set by id: " + id); + } + + /** + * 添加图标集 + * + * @param set 图标集 + */ + public static void addSet(@NotNull IconSet set) { + ICON_SETS.remove(set); + ICON_SETS.add(set); + clearCache(); + } + + /** + * 根据图标ID获取图标 + *

+ * 查找路径 + * 1）查找图集图标 + * 2）路径为图片图标，从路径再查找 + * 3）提供默认svg图标 + * + * @param id 图标ID + * @param 图标类型 + * @return 图标 + */ + @NotNull + public static I getIcon(@NotNull final String id, @NotNull Dimension dimension, @NotNull IconType type) { + Icon icon = findIcon(id, dimension, type); + if (icon == null) { + // 只有找不到再进行其他fallback，提升效率 + if (IconManager.isImageIcon(id)) { + return (I) fallbackLegacyIcon(id); + } else { + FineLoggerFactory.getLogger().warn("[IconManager] Can not find icon by id: " + id); + return (I) new LazyIcon("default"); + } + } + return (I) icon; + } + + private static Icon fallbackLegacyIcon(String id) { + return IOUtils.readIcon(id); + } + + @Nullable + private static I findIcon(String id, Dimension dimension, IconType type) { + String cacheKey = genCacheKey(id, dimension, type); + final WeakReference reference = CACHE.get(cacheKey); + I icon = reference != null ? (I) reference.get() : null; + if (icon == null) { + for (IconSet set : ICON_SETS) { + Icon f = set.findIcon(id, dimension, type); + if (f != null) { + icon = (I) f; + CACHE.put(cacheKey, new WeakReference<>(icon)); + } + } + } + return icon; + } + + + /** + * 生成缓存key + * + * @param id id + * @param dimension 尺寸 + * @param type 图标类型 + * @return 缓存key + */ + public static @NotNull String genCacheKey(String id, Dimension dimension, IconType type) { + if (DEFAULT_DIMENSION.equals(dimension)) { + return id + "_" + type; + } + return id + "_" + dimension.width + "_" + dimension.height + "_" + type; + } + + /** + * 是否SVG图标格式 + * + * @param path 路径 + * @return 是否SVG图标格式 + */ + public static boolean isSvgIcon(String path) { + return FileExtension.SVG.matchExtension(path); + } + + /** + * 是否支持的图片图标格式，目前只支持png和jpg + * + * @param path 路径 + * @return 是否支持的图片图标格式 + */ + public static boolean isImageIcon(String path) { + return FileExtension.PNG.matchExtension(path) + || FileExtension.JPG.matchExtension(path); + } + + /** + * 判断是否存在指定id的icon，非io读取行为，而是从已注册的sourceMap中遍历判断 + * + * @param id id + * @return 是否存在 + */ + public static boolean existIcon(String id) { + for (IconSet set : ICON_SETS) { + if (set.getIds().contains(id)) { + return true; + } + } + return false; + } + + /** + * 清理所有缓存 + */ + public static void clearCache() { + CACHE.clear(); + } + + /** + * 查找灰化图标 + * + * @param path 原始路径 + * @return 灰化路径 + */ + public static String findDisablePath(String path) { + int i = path.lastIndexOf('.'); + return path.substring(0, i) + ICON_DISABLE_SUFFIX + path.substring(i); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/IconResource.java b/designer-base/src/main/java/com/fine/theme/icon/IconResource.java new file mode 100644 index 0000000000..d519601391 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/IconResource.java @@ -0,0 +1,23 @@ +package com.fine.theme.icon; + +import org.jetbrains.annotations.NotNull; + +import java.io.InputStream; + +/** + * 资源接口 + * + * @author vito + * @since 11.0 + * Created on 2023/11/6 + */ +public interface IconResource { + + /** + * 获取输入资源流 + * + * @return 资源流 + */ + @NotNull + InputStream getInputStream(); +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/IconSet.java b/designer-base/src/main/java/com/fine/theme/icon/IconSet.java new file mode 100644 index 0000000000..d60aed98d4 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/IconSet.java @@ -0,0 +1,50 @@ +package com.fine.theme.icon; + +import com.fr.third.errorprone.annotations.Immutable; +import org.jetbrains.annotations.NotNull; + +import javax.swing.Icon; +import java.awt.Dimension; +import java.util.Collection; + +/** + * 图标集 + * + * @author vito + * @since 11.0 + * Created on 2023/11/6 + */ +@Immutable +public interface IconSet extends Identifiable { + + /** + * 返回集合中所有 Icons 的 id。 + * + * @return 集合中所有 Icons 的 id。 + */ + @NotNull + Collection getIds(); + + /** + * 将指定 IconSource 引用的新 Icon 添加到集合中。 + * + * @param icon icon 源 + */ + void addIcon(@NotNull IconSource icon); + + /** + * 将指定 IconSource 引用的新 Icon 添加到集合中。 + * + * @param icon icon 源 + */ + void addIcon(@NotNull IconSource... icon); + + /** + * 返回指定 id 的 Icon。 + * + * @param id id + * @return Icon + */ + Icon findIcon(@NotNull String id, @NotNull Dimension dimension, IconType type); + +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/IconSource.java b/designer-base/src/main/java/com/fine/theme/icon/IconSource.java new file mode 100644 index 0000000000..187ec69cdf --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/IconSource.java @@ -0,0 +1,37 @@ +package com.fine.theme.icon; + +import com.fr.third.errorprone.annotations.Immutable; +import org.jetbrains.annotations.NotNull; + +import javax.swing.Icon; +import java.awt.Dimension; +import java.io.Serializable; + +/** + * 图标源，在进行图标管理的时候代替真实图标对象 + * 使用时加载，节省内存 + * + * @author vito + * @since 11.0 + * Created on 2023/11/6 + */ +@Immutable +public interface IconSource extends Identifiable, Cloneable, Serializable { + + /** + * 获取图标资源 + * + * @return 图标资源 + */ + @NotNull + IconResource getResource(); + + + /** + * 加载图标 + * + * @return 图标 + */ + @NotNull + I loadIcon(Dimension dimension, IconType type); +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/IconType.java b/designer-base/src/main/java/com/fine/theme/icon/IconType.java new file mode 100644 index 0000000000..0e5821a469 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/IconType.java @@ -0,0 +1,24 @@ +package com.fine.theme.icon; + +/** + * 图标类型 + * + * @author vito + * @since 11.0 + * Created on 2024/01/09 + */ +public enum IconType { + /** + * 灰化图 + */ + disable, + /** + * 白化图，用于反白场景 + */ + white, + /** + * 原始图 + */ + normal + +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/Identifiable.java b/designer-base/src/main/java/com/fine/theme/icon/Identifiable.java new file mode 100644 index 0000000000..b1d32e4ae1 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/Identifiable.java @@ -0,0 +1,12 @@ +package com.fine.theme.icon; + +/** + * id 接口 + * + * @author vito + * @since 11.0 + * Created on 2023/11/6 + */ +public interface Identifiable { + String getId(); +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/JsonIconSet.java b/designer-base/src/main/java/com/fine/theme/icon/JsonIconSet.java new file mode 100644 index 0000000000..fc769c7557 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/JsonIconSet.java @@ -0,0 +1,125 @@ +package com.fine.theme.icon; + +import com.fine.theme.icon.img.ImageIconSource; +import com.fine.theme.icon.svg.SvgIconSource; +import com.formdev.flatlaf.json.Json; +import com.formdev.flatlaf.json.ParseException; +import com.fr.stable.StringUtils; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.util.Map; +import java.util.Objects; + + +/** + * json 格式图标集 + * + * @author vito + * @since 11.0 + * Created on 2023/11/17 + */ +public class JsonIconSet extends AbstractIconSet { + + private String base; + + public JsonIconSet(UrlIconResource resource) { + addIcon(new SvgIconSource("default", "com/fine/theme/icon/default.svg")); + Map json; + try (InputStream in = resource.getInputStream()) { + try (Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) { + json = (Map) Json.parse(reader); + } + } catch (ParseException | IOException ex) { + throw new RuntimeException(ex.getMessage(), ex); + } + + + name = (String) json.get("name"); + dark = Boolean.parseBoolean((String) json.get("dark")); + base = (String) json.get("base"); + if (base == null) { + base = StringUtils.EMPTY; + } + + Map icons = (Map) json.get("icons"); + + for (Map.Entry icon : icons.entrySet()) { + applyIcon(icon.getKey(), icon.getValue()); + } + + } + + /** + * 从配置文件中添加icon，只处理认识的格式和结构 + */ + private void applyIcon(String key, Object value) { + if (value instanceof String) { + dealWithIconString(key, (String) value); + } else if (value instanceof Map) { + dealWithIconMap(key, (Map) value); + } + } + + /** + * 处理字符串格式的icon配置 + */ + private void dealWithIconString(String key, String value) { + if (IconManager.isSvgIcon(value)) { + // 默认字符串提供正常图和灰化图 + addIcon(new SvgIconSource(key, + base + value, + IconManager.findDisablePath(base + value), + null + )); + } else if (IconManager.isImageIcon(value)) { + addIcon(new ImageIconSource(key, base + value)); + } + // 其他无法识别格式不处理 + } + + /** + * 处理object形式的icon配置 + */ + private void dealWithIconMap(String key, Map value) { + String normalPath = (String) value.get(IconType.normal.name()); + String disablePath = (String) value.get(IconType.disable.name()); + String whitePath = (String) value.get(IconType.white.name()); + // 暂不支持混合格式，每个id的格式需要保持一致 + if (IconManager.isSvgIcon(normalPath)) { + addIcon(new SvgIconSource(key, + base + normalPath, + StringUtils.isNotBlank(disablePath) ? base + disablePath : null, + StringUtils.isNotBlank(whitePath) ? base + whitePath : null + )); + } else if (IconManager.isImageIcon(normalPath)) { + addIcon(new ImageIconSource(key, + base + normalPath, + StringUtils.isNotBlank(disablePath) ? base + disablePath : null, + StringUtils.isNotBlank(whitePath) ? base + whitePath : null + )); + } + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + JsonIconSet that = (JsonIconSet) o; + return Objects.equals(name, that.name); + } + + @Override + public int hashCode() { + return Objects.hashCode(name); + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/LazyIcon.java b/designer-base/src/main/java/com/fine/theme/icon/LazyIcon.java new file mode 100644 index 0000000000..e93e619684 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/LazyIcon.java @@ -0,0 +1,120 @@ +package com.fine.theme.icon; + +import com.fr.third.errorprone.annotations.Immutable; +import org.jetbrains.annotations.NotNull; + +import javax.swing.Icon; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics; +import java.util.StringJoiner; + +import static com.fine.theme.utils.FineUIScale.scale; + +/** + * 懒加载图标 + * 非常懒，宽高都不想算 + * + * @author vito + * @since 11.0 + * Created on 2023/11/6 + */ +@Immutable +public class LazyIcon implements Identifiable, DisabledIcon, WhiteIcon, Icon { + @NotNull + private final String id; + + private final Dimension dimension; + + private final IconType type; + + public LazyIcon(@NotNull final String id) { + this.id = id; + this.dimension = IconManager.DEFAULT_DIMENSION; + this.type = IconType.normal; + } + + public LazyIcon(@NotNull final String id, int side) { + this.id = id; + this.dimension = new Dimension(side, side); + this.type = IconType.normal; + } + + public LazyIcon(@NotNull final String id, @NotNull Dimension dimension) { + this.id = id; + this.dimension = dimension; + this.type = IconType.normal; + } + + private LazyIcon(@NotNull final String id, @NotNull IconType type) { + this.id = id; + this.dimension = IconManager.DEFAULT_DIMENSION; + this.type = type; + } + + public LazyIcon(@NotNull final String id, @NotNull Dimension dimension, @NotNull IconType type) { + this.id = id; + this.dimension = dimension; + this.type = type; + } + + + @NotNull + @Override + public String getId() { + return id; + } + + @Override + public void paintIcon(@NotNull final Component c, @NotNull final Graphics g, final int x, final int y) { + getIcon().paintIcon(c, g, x, y); + } + + @Override + public int getIconWidth() { + return scale(dimension.width); + } + + @Override + public int getIconHeight() { + return scale(dimension.height); + } + + + @NotNull + public I getIcon() { + return IconManager.getIcon(getId(), dimension, type); + } + + /** + * 创建一份灰化图标 + * + * @return 灰化图标 + */ + @NotNull + @Override + public Icon disabled() { + return new LazyIcon(getId(), dimension, IconType.disable); + } + + /** + * 创建一份白化图标 + * + * @return 白化图标 + */ + @NotNull + @Override + public Icon white() { + return new LazyIcon(getId(), dimension, IconType.white); + } + + + @Override + public String toString() { + return new StringJoiner(", ", LazyIcon.class.getSimpleName() + "[", "]") + .add("id='" + id + "'") + .add("size=" + "[w=" + scale(dimension.width) + ",h=" + scale(dimension.height) + "]") + .add("type=" + type) + .toString(); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/UrlIconResource.java b/designer-base/src/main/java/com/fine/theme/icon/UrlIconResource.java new file mode 100644 index 0000000000..61746e3bf5 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/UrlIconResource.java @@ -0,0 +1,53 @@ +package com.fine.theme.icon; + +import com.fr.general.IOUtils; +import com.fr.io.utils.ResourceIOUtils; +import com.fr.third.errorprone.annotations.Immutable; +import org.jetbrains.annotations.NotNull; + +import java.io.InputStream; +import java.util.StringJoiner; + +/** + * url图标资源 + * + * @author vito + * @since 11.0 + * Created on 2023/11/15 + */ +@Immutable +public class UrlIconResource implements IconResource { + + private final String path; + + public UrlIconResource(String path) { + this.path = path; + } + + public String getPath() { + return path; + } + + @Override + @NotNull + public InputStream getInputStream() { + InputStream inputStream = getInputStream(path); + if (inputStream == null) { + throw new IconException("Icon load failed: " + path); + } + return inputStream; + } + + + private InputStream getInputStream(String path) { + InputStream inputStream = IOUtils.getInputStream(path); + return inputStream != null ? inputStream : ResourceIOUtils.read(path); + } + + @Override + public String toString() { + return new StringJoiner(", ", UrlIconResource.class.getSimpleName() + "[", "]") + .add("path='" + path + "'") + .toString(); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/WhiteIcon.java b/designer-base/src/main/java/com/fine/theme/icon/WhiteIcon.java new file mode 100644 index 0000000000..e7bdb9af8c --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/WhiteIcon.java @@ -0,0 +1,22 @@ +package com.fine.theme.icon; + +import org.jetbrains.annotations.NotNull; + +import javax.swing.Icon; + +/** + * 白化图像 + * + * @author vito + * @since 11.0 + * Created on 2024/1/8 + */ +public interface WhiteIcon { + /** + * 创建一份白化图标 + * + * @return 灰化图标 + */ + @NotNull + Icon white(); +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/icons/AnimatedRadioButtonIcon.java b/designer-base/src/main/java/com/fine/theme/icon/icons/AnimatedRadioButtonIcon.java new file mode 100644 index 0000000000..6449dc5261 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/icons/AnimatedRadioButtonIcon.java @@ -0,0 +1,75 @@ +package com.fine.theme.icon.icons; + +import com.formdev.flatlaf.icons.FlatAnimatedIcon; +import com.formdev.flatlaf.util.ColorFunctions; +import org.jetbrains.annotations.Nullable; + +import javax.swing.AbstractButton; +import javax.swing.ButtonModel; +import javax.swing.JRadioButton; +import javax.swing.UIManager; +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.geom.Ellipse2D; + +/** + * RadioButton 图标，带动画 + * + * @author vito + * @since 11.0 + * Created on 2023/11/22 + */ +public class AnimatedRadioButtonIcon + extends FlatAnimatedIcon { + private static final int SIZE = 16; + private static final int BORDER_SIZE = 2; + private static final int ON_SIZE = 8; + + private final Color offColor = UIManager.getColor("CheckBox.icon.borderColor"); + private final Color onColor = UIManager.getColor("CheckBox.icon.checkmarkColor"); + + public AnimatedRadioButtonIcon() { + super(SIZE, SIZE, null); + } + + @Override + public void paintIconAnimated(Component c, Graphics g, int x, int y, float animatedValue) { + Color color = ColorFunctions.mix(onColor, offColor, animatedValue); + + // border + g.setColor(getBorderColor(c, color, onColor)); + g.fillOval(0, 0, SIZE, SIZE); + + // background + g.setColor(c.getBackground()); + float onDiameter = SIZE - (BORDER_SIZE + (ON_SIZE - BORDER_SIZE) * (animatedValue)); + float xy = (SIZE - onDiameter) / 2f; + ((Graphics2D) g).fill(new Ellipse2D.Float(xy, xy, onDiameter, onDiameter)); + + } + + @Nullable + private Color getBorderColor(Component c, Color enableColor, Color hoverColor) { + if (c instanceof AbstractButton) { + ButtonModel model = ((AbstractButton) c).getModel(); + + if (model.isRollover()) { + return hoverColor; + } + } + return enableColor; + } + + + @Override + public float getValue(Component c) { + return ((JRadioButton) c).isSelected() ? 1 : 0; + } + + @Override + public int getAnimationDuration() { + return 200; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/img/ImageIconSource.java b/designer-base/src/main/java/com/fine/theme/icon/img/ImageIconSource.java new file mode 100644 index 0000000000..2f0c17d442 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/img/ImageIconSource.java @@ -0,0 +1,58 @@ +package com.fine.theme.icon.img; + +import com.fine.theme.icon.AbstractIconSource; +import com.fine.theme.icon.IconResource; +import com.fine.theme.icon.IconType; +import com.fine.theme.icon.UrlIconResource; +import com.fr.clone.cloning.Immutable; +import com.fr.general.FRLogger; +import com.fr.general.IOUtils; +import com.fr.stable.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.ImageIcon; +import java.awt.Dimension; +import java.awt.image.BufferedImage; + +/** + * 图片图标源 + * + * @author vito + * @since 11.0 + * Created on 2024/05/09 + */ +@Immutable +public class ImageIconSource extends AbstractIconSource { + + + public ImageIconSource(@NotNull String id, @NotNull String resource) { + super(id, new UrlIconResource(resource)); + } + + public ImageIconSource(@NotNull String id, + @NotNull String resource, + @Nullable String grayResource, + @Nullable String whiteResource) { + super(id, new UrlIconResource(resource), + StringUtils.isEmpty(grayResource) ? null : new UrlIconResource(grayResource), + StringUtils.isEmpty(whiteResource) ? null : new UrlIconResource(whiteResource)); + } + + @NotNull + @Override + protected ImageIcon loadIcon(@NotNull IconResource resource, Dimension dimension, IconType type) { + byte[] bytes = IOUtils.inputStream2Bytes(resource.getInputStream()); + if (bytes == null && resource instanceof UrlIconResource) { + // 换readImageWithCache尝试读取 + UrlIconResource iconResource = (UrlIconResource) resource; + BufferedImage icon = IOUtils.readImageWithCache(iconResource.getPath()); + if (icon == null) { + FRLogger.getLogger().error(iconResource.getPath()); + return new ImageIcon(); + } + return new ImageIcon(icon); + } + return new ImageIcon(bytes); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/svg/SvgIcon.java b/designer-base/src/main/java/com/fine/theme/icon/svg/SvgIcon.java new file mode 100644 index 0000000000..eee575d50b --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/svg/SvgIcon.java @@ -0,0 +1,207 @@ +package com.fine.theme.icon.svg; + +import com.fine.theme.icon.DisabledIcon; +import com.fine.theme.icon.GraphicsFilter; +import com.fine.theme.icon.IconManager; +import com.fine.theme.icon.IconResource; +import com.fine.theme.icon.IconType; +import com.fine.theme.icon.UrlIconResource; +import com.fine.theme.icon.WhiteIcon; +import com.formdev.flatlaf.FlatLaf; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.GrayFilter; +import com.fr.clone.cloning.Immutable; +import com.fr.log.FineLoggerFactory; +import com.fr.value.NullableLazyValue; +import com.github.weisj.jsvg.SVGDocument; +import com.github.weisj.jsvg.attributes.ViewBox; +import com.github.weisj.jsvg.parser.SVGLoader; +import org.jetbrains.annotations.NotNull; + +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.UIManager; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.image.RGBImageFilter; +import java.util.StringJoiner; + +import static com.fine.theme.utils.FineUIScale.scale; + +/** + * svg图标 + * 1.绘制长度会跟随DPI比率变化 + * 1跟2的缩放原因不同，因此不能混淆，宽高测量等依旧 + * 使用DPI缩放进行，只有绘制内容时使用Retina绘制（如果有） + * Retina绘制不影响最终尺寸，注意区分 + * + * @author vito + * @since 11.0 + * Created on 2023/11/15 + */ +@Immutable +public class SvgIcon implements DisabledIcon, WhiteIcon, Icon { + + private final Dimension size; + private final Dimension scaleSize; + private final IconResource resource; + private final IconType type; + + private final static NullableLazyValue DEFAULT_ICON_DOC = + NullableLazyValue.createValue(SvgIcon::loadDefault); + private final NullableLazyValue svgDocument = + NullableLazyValue.createValue(() -> load(IconType.normal)); + private final NullableLazyValue whiteSvgDocument = + NullableLazyValue.createValue(() -> load(IconType.white)); + + public SvgIcon(IconResource resource, Dimension size, IconType type) { + this.resource = resource; + this.size = size; + // 根据dpi进行缩放 + this.scaleSize = scale(size); + this.type = type; + } + + /** + * 如果支持绘制Retina绘制，则进行Retina绘制， + * 绘制结束不影响任何外部尺寸 + */ + @Override + public void paintIcon(Component c, Graphics g, int x, int y) { + if (type == IconType.disable) { + g = grayGraphics(g); + } + Object[] oldRenderingHints = FlatUIUtils.setRenderingHints(g); + try { + render(c, g, x, y, this::fallbackRender); + } finally { + FlatUIUtils.resetRenderingHints(g, oldRenderingHints); + } + } + + /** + * 用于fallback渲染disable图像，这段代码来自异常分支，使用率要保持较低水平 + */ + private boolean fallbackRender(Component c, Graphics g, int x, int y) { + if (resource instanceof UrlIconResource) { + String path = ((UrlIconResource) resource).getPath(); + int index = path.lastIndexOf(IconManager.ICON_DISABLE_SUFFIX); + if (path.contains(IconManager.ICON_DISABLE_SUFFIX) && index > 0) { + SVGLoader loader = new SVGLoader(); + SVGDocument document = loader.load( + new UrlIconResource(path.substring(0, index) + + path.substring(index + IconManager.ICON_DISABLE_SUFFIX.length())) + .getInputStream()); + if (document != null) { + document.render((JComponent) c, grayGraphics(g), + new ViewBox(x, y, scaleSize.width, scaleSize.height)); + return true; + } + } + } + return false; + } + + private Graphics2D grayGraphics(Graphics g) { + Object grayFilterObj = UIManager.get("Component.grayFilter"); + RGBImageFilter grayFilter = (grayFilterObj instanceof RGBImageFilter) + ? (RGBImageFilter) grayFilterObj + : GrayFilter.createDisabledIconFilter(FlatLaf.isLafDark()); + + return new GraphicsFilter((Graphics2D) g.create(), grayFilter); + } + + @Override + public int getIconWidth() { + return scaleSize.width; + } + + @Override + public int getIconHeight() { + return scaleSize.height; + } + + private void render(Component c, Graphics g, int x, int y, FallbackRender fallbackRender) { + SVGDocument document; + try { + if (type == IconType.white) { + document = whiteSvgDocument.getValue(); + } else { + document = svgDocument.getValue(); + } + // 由于 weisj 库中加载svg描述出现问题，则返回一个Null，这里补充一个默认图标 + if (document == null) { + document = DEFAULT_ICON_DOC.getValue(); + } + document.render((JComponent) c, (Graphics2D) g, new ViewBox(x, y, scaleSize.width, scaleSize.height)); + } catch (Exception e) { + boolean rendered = fallbackRender.render(c, g, x, y); + if (rendered) { + FineLoggerFactory.getLogger().warn("SvgIcon from url: " + resource + " paint with fallbackRender"); + } else { + FineLoggerFactory.getLogger().error("SvgIcon from url: " + resource + "can not paint.", e); + } + } + } + + private static SVGDocument loadDefault() { + SVGLoader loader = new SVGLoader(); + UrlIconResource iconResource = new UrlIconResource("com/fine/theme/icon/default.svg"); + return loader.load(iconResource.getInputStream()); + } + + + private SVGDocument load(IconType type) { + SVGLoader loader = new SVGLoader(); + return type == IconType.white + ? loader.load(resource.getInputStream(), new WhiteParser()) + : loader.load(resource.getInputStream()); + } + + @Override + public String toString() { + return new StringJoiner(", ", SvgIcon.class.getSimpleName() + "[", "]") + .add("resource=" + resource) + .add("type=" + type) + .add("size=" + size) + .add("scaleSize=" + scaleSize) + .toString(); + } + + /** + * 默认提供一个简单的灰化处理 + */ + @Override + public @NotNull SvgIcon white() { + return new SvgIcon(resource, size, IconType.white); + } + + + /** + * 默认提供一个简单的灰化处理 + */ + @Override + public @NotNull SvgIcon disabled() { + return new SvgIcon(resource, size, IconType.disable); + } + + + /** + * 用于回退渲染的回调类 + */ + @FunctionalInterface + interface FallbackRender { + /** + * 渲染图标 + * + * @param c 待绘制组件 + * @param g 抽象画板 + * @param x 起点横坐标 + * @param y 起点纵坐标 + * @return 是否使用了回退渲染 + */ + boolean render(Component c, Graphics g, int x, int y); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/svg/SvgIconSource.java b/designer-base/src/main/java/com/fine/theme/icon/svg/SvgIconSource.java new file mode 100644 index 0000000000..eeb929dd92 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/svg/SvgIconSource.java @@ -0,0 +1,43 @@ +package com.fine.theme.icon.svg; + +import com.fine.theme.icon.AbstractIconSource; +import com.fine.theme.icon.IconResource; +import com.fine.theme.icon.IconType; +import com.fine.theme.icon.UrlIconResource; +import com.fr.clone.cloning.Immutable; +import com.fr.stable.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.awt.Dimension; + +/** + * svg图标源 + * + * @author vito + * @since 11.0 + * Created on 2023/11/14 + */ +@Immutable +public class SvgIconSource extends AbstractIconSource { + + + public SvgIconSource(@NotNull String id, @NotNull String resource) { + super(id, new UrlIconResource(resource)); + } + + public SvgIconSource(@NotNull String id, + @NotNull String resource, + @Nullable String grayResource, + @Nullable String whiteResource) { + super(id, new UrlIconResource(resource), + StringUtils.isEmpty(grayResource) ? null : new UrlIconResource(grayResource), + StringUtils.isEmpty(whiteResource) ? null : new UrlIconResource(whiteResource)); + } + + @NotNull + @Override + protected SvgIcon loadIcon(@NotNull IconResource resource, Dimension dimension, IconType type) { + return new SvgIcon(resource, dimension, type); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/svg/WhiteParser.java b/designer-base/src/main/java/com/fine/theme/icon/svg/WhiteParser.java new file mode 100644 index 0000000000..1db3c987dc --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/svg/WhiteParser.java @@ -0,0 +1,50 @@ +package com.fine.theme.icon.svg; + +import com.github.weisj.jsvg.attributes.paint.AwtSVGPaint; +import com.github.weisj.jsvg.attributes.paint.PaintParser; +import com.github.weisj.jsvg.attributes.paint.SVGPaint; +import com.github.weisj.jsvg.parser.AttributeNode; +import com.github.weisj.jsvg.parser.DefaultParserProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.awt.Color; + +/** + * svg绘制白化转化器 + * + * @author vito + * @since 11.0 + * Created on 2024/1/8 + */ +public class WhiteParser extends DefaultParserProvider { + @Override + public @NotNull PaintParser createPaintParser() { + return new WhitePaintParser(super.createPaintParser()); + } + + + static class WhitePaintParser implements PaintParser { + + private final PaintParser delegate; + + WhitePaintParser(PaintParser delegate) { + this.delegate = delegate; + } + + @Override + public @Nullable Color parseColor(@NotNull String value, @NotNull AttributeNode attributeNode) { + return delegate.parseColor(value, attributeNode); + } + + @Override + public @Nullable SVGPaint parsePaint(@Nullable String value, @NotNull AttributeNode attributeNode) { + SVGPaint paint = delegate.parsePaint(value, attributeNode); + if (!(paint instanceof AwtSVGPaint)) { + return paint; + } + return new AwtSVGPaint(Color.WHITE); + } + } +} + diff --git a/designer-base/src/main/java/com/fine/theme/icon/svg/batik/BatikSvgIcon.java b/designer-base/src/main/java/com/fine/theme/icon/svg/batik/BatikSvgIcon.java new file mode 100644 index 0000000000..80848e5761 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/svg/batik/BatikSvgIcon.java @@ -0,0 +1,160 @@ +package com.fine.theme.icon.svg.batik; + +import com.fine.theme.icon.DisabledIcon; +import com.fine.theme.icon.GraphicsFilter; +import com.fine.theme.icon.IconResource; +import com.fine.theme.icon.IconType; +import com.fine.theme.icon.WhiteIcon; +import com.formdev.flatlaf.FlatLaf; +import com.formdev.flatlaf.util.GrayFilter; +import com.fr.clone.cloning.Immutable; +import com.fr.log.FineLoggerFactory; +import org.apache.batik.transcoder.TranscoderException; +import org.apache.batik.transcoder.TranscoderInput; +import org.jetbrains.annotations.NotNull; + +import javax.swing.Icon; +import javax.swing.UIManager; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.awt.image.RGBImageFilter; +import java.util.StringJoiner; + +import static com.fine.theme.utils.FineUIScale.scale; +import static com.fine.theme.utils.FineUIUtils.RETINA_SCALE_FACTOR; +import static com.fine.theme.utils.FineUIUtils.getRetina; + +/** + * svg图标 + * 1.绘制长度会跟随DPI比率变化 + * 1跟2的缩放原因不同，因此不能混淆，宽高测量等依旧 + * 使用DPI缩放进行，只有绘制内容时使用Retina绘制（如果有） + * Retina绘制不影响最终尺寸，注意区分 + * + * @author vito + * @since 11.0 + * Created on 2023/11/15 + */ +@Immutable +public class BatikSvgIcon implements DisabledIcon, WhiteIcon, Icon { + + private final Dimension size; + private final Dimension scaleSize; + private final IconResource resource; + private final IconType type; + + + public BatikSvgIcon(IconResource resource, Dimension size) { + this(resource, size, IconType.normal); + } + + public BatikSvgIcon(IconResource resource, Dimension size, IconType type) { + this.resource = resource; + this.size = size; + // 根据dpi进行缩放 + this.scaleSize = scale(size); + this.type = type; + } + + public BatikSvgIcon(IconResource resource, int side) { + this(resource, new Dimension(side, side), IconType.normal); + } + + + /** + * 如果支持绘制Retina绘制，则进行Retina绘制， + * 绘制结束不影响任何外部尺寸 + */ + @Override + public void paintIcon(Component c, Graphics g, int x, int y) { + if (getRetina()) { + BufferedImage image = toImage(scaleRetina(size)); + // 高清绘制的原理：scale(1/2,1/2)的原理是坐标减半，底层是矩阵进行坐标变换，意思是坐标减半进行绘制， + // 这样就可以将两倍图绘制到一倍的大小，如果这时候设备支持Retina绘制（四个像素模拟一个像素）， + // 正好就可以将4个像素利用起来，每个像素点都有不同的颜色，而不像之前只能是四个共用一个颜色。因此图像 + // 可以更加细腻当然，绘图之后，需要将这个坐标变换给恢复。 + ((Graphics2D) g).scale(1.0 / RETINA_SCALE_FACTOR, 1.0 / RETINA_SCALE_FACTOR); + g.drawImage(image, x * RETINA_SCALE_FACTOR, y * RETINA_SCALE_FACTOR, null); + ((Graphics2D) g).scale(RETINA_SCALE_FACTOR, RETINA_SCALE_FACTOR); + } else { + BufferedImage image = toImage(size); + g.drawImage(image, x, y, null); + } + } + + private static Dimension scaleRetina(Dimension dimension) { + return getRetina() + ? new Dimension(dimension.width * RETINA_SCALE_FACTOR, dimension.height * RETINA_SCALE_FACTOR) + : dimension; + } + + /** + * 根据指定尺寸绘制图片，这里尺寸为结算后的尺寸， + * 因此不必进行缩放 + * + * @param size 图像尺寸 + * @return 图像 + */ + private BufferedImage toImage(Dimension size) { + SvgTranscoder transcoder = new SvgTranscoder(size); + TranscoderInput transcoderInput = new TranscoderInput(resource.getInputStream()); + try { + transcoder.transcode(transcoderInput, null); + return transcoder.getImage(); + } catch (TranscoderException e) { + FineLoggerFactory.getLogger().error("SvgIcon from url: " + resource + "can not paint.", e); + } + return transcoder.getImage(); + } + + + private Graphics2D grayGraphics(Graphics g) { + Object grayFilterObj = UIManager.get("Component.grayFilter"); + RGBImageFilter grayFilter = (grayFilterObj instanceof RGBImageFilter) + ? (RGBImageFilter) grayFilterObj + : GrayFilter.createDisabledIconFilter(FlatLaf.isLafDark()); + + return new GraphicsFilter((Graphics2D) g.create(), grayFilter); + } + + @Override + public int getIconWidth() { + return scaleSize.width; + } + + @Override + public int getIconHeight() { + return scaleSize.height; + } + + + @Override + public String toString() { + return new StringJoiner(", ", BatikSvgIcon.class.getSimpleName() + "[", "]") + .add("resource=" + resource) + .add("type=" + type) + .add("size=" + size) + .add("scaleSize=" + scaleSize) + .toString(); + } + + /** + * 默认提供一个简单的灰化处理 + */ + @Override + public @NotNull BatikSvgIcon white() { + return new BatikSvgIcon(resource, size, IconType.white); + } + + + /** + * 默认提供一个简单的灰化处理 + */ + @Override + public @NotNull BatikSvgIcon disabled() { + return new BatikSvgIcon(resource, size, IconType.disable); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/icon/svg/batik/SvgTranscoder.java b/designer-base/src/main/java/com/fine/theme/icon/svg/batik/SvgTranscoder.java new file mode 100644 index 0000000000..2fd3663167 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/icon/svg/batik/SvgTranscoder.java @@ -0,0 +1,90 @@ +package com.fine.theme.icon.svg.batik; + +import org.apache.batik.transcoder.SVGAbstractTranscoder; +import org.apache.batik.transcoder.TranscoderException; +import org.apache.batik.transcoder.TranscoderOutput; +import org.apache.batik.transcoder.image.ImageTranscoder; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.image.BufferedImage; +import java.awt.image.DataBuffer; +import java.awt.image.IndexColorModel; +import java.awt.image.Raster; + +/** + * Svg图标转码器 + * + * @author vito + * @since 11.0 + * Created on 2023/11/15 + */ +public class SvgTranscoder extends ImageTranscoder { + + public enum Type { + gray, white, origin + } + + private BufferedImage bufferedImage; + private Type type = Type.origin; + + public SvgTranscoder(Dimension size) { + addTranscodingHint(SVGAbstractTranscoder.KEY_WIDTH, (float) size.getWidth()); + addTranscodingHint(SVGAbstractTranscoder.KEY_HEIGHT, (float) size.getHeight()); + } + + public SvgTranscoder(Dimension size, Color background, Type type) { + this.type = type; + addTranscodingHint(SVGAbstractTranscoder.KEY_WIDTH, (float) size.getWidth()); + addTranscodingHint(SVGAbstractTranscoder.KEY_HEIGHT, (float) size.getHeight()); + addTranscodingHint(ImageTranscoder.KEY_BACKGROUND_COLOR, background); + } + + + public SvgTranscoder(float width, float height) { + addTranscodingHint(SVGAbstractTranscoder.KEY_WIDTH, width); + addTranscodingHint(SVGAbstractTranscoder.KEY_HEIGHT, height); + } + + @Override + public BufferedImage createImage(int width, int height) { + switch (type) { + case gray: + return createGrayImage(width, height); + case white: + return createWhiteImage(width, height); + default: + return new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); + } + } + + /** + * 灰化底图 + */ + private BufferedImage createGrayImage(int width, int height) { + return new BufferedImage(width, height, BufferedImage.TYPE_BYTE_GRAY); + } + + + /** + * 灰化底图 + */ + private BufferedImage createWhiteImage(int width, int height) { + byte[] arr = {(byte) 0xff, (byte) 0,}; + return new BufferedImage( + new IndexColorModel(1, 2, arr, arr, arr), + Raster.createPackedRaster(DataBuffer.TYPE_BYTE, width, height, 1, 1, null), + false, + null); + } + + + @Override + public void writeImage(BufferedImage bufferedImage, TranscoderOutput transcoderOutput) throws TranscoderException { + this.bufferedImage = bufferedImage; + } + + public BufferedImage getImage() { + return bufferedImage; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/CollapsibleScrollBarLayerUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/CollapsibleScrollBarLayerUI.java new file mode 100644 index 0000000000..86160ea975 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/CollapsibleScrollBarLayerUI.java @@ -0,0 +1,73 @@ +package com.fine.theme.light.ui; + +import com.fr.design.gui.icontainer.UIScrollPane; + +import javax.swing.JComponent; +import javax.swing.JLayer; +import javax.swing.JScrollPane; +import javax.swing.ScrollPaneConstants; +import javax.swing.plaf.LayerUI; +import java.awt.AWTEvent; +import java.awt.Component; +import java.awt.event.MouseEvent; + +/** + * 滚动面板的装饰层UI，支持滚动条仅当悬浮时显示 + * 使用见工具类: {@link com.fine.theme.utils.FineUIUtils#createCollapsibleScrollBarLayer(Component)} + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/01/25 + */ +public class CollapsibleScrollBarLayerUI extends LayerUI { + private final int verticalPolicy; + private final int horizontalPolicy; + + public CollapsibleScrollBarLayerUI() { + this(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + } + + public CollapsibleScrollBarLayerUI(int verticalPolicy, int horizontalPolicy) { + this.verticalPolicy = verticalPolicy; + this.horizontalPolicy = horizontalPolicy; + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + if (c instanceof JLayer) { + ((JLayer) c).setLayerEventMask(AWTEvent.MOUSE_EVENT_MASK); + } + } + + @Override + public void uninstallUI(JComponent c) { + if (c instanceof JLayer) { + ((JLayer) c).setLayerEventMask(0); + } + super.uninstallUI(c); + } + + @Override + protected void processMouseEvent(MouseEvent e, JLayer l) { + JScrollPane view = l.getView(); + switch (e.getID()) { + case MouseEvent.MOUSE_ENTERED: + // 在鼠标进入时恢复滚动条显示策略 + if (view != null) { + view.setVerticalScrollBarPolicy(verticalPolicy); + view.setHorizontalScrollBarPolicy(horizontalPolicy); + } + break; + case MouseEvent.MOUSE_EXITED: + // 在鼠标退出时隐藏滚动条 + if (view != null) { + view.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); + view.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + } + break; + default: + break; + } + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonBorder.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonBorder.java new file mode 100644 index 0000000000..16405a1552 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonBorder.java @@ -0,0 +1,42 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatButtonBorder; + +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Paint; + +import static com.fine.theme.light.ui.FineButtonUI.isPartRoundButton; + +/** + * 按钮边框 + * + * @author vito + * @since 11.0 + * Created on 2023/12/20 + */ +public class FineButtonBorder extends FlatButtonBorder { + + public FineButtonBorder() { + } + + + @Override + public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { + if (isPartRoundButton(c)) { + Graphics2D g2 = (Graphics2D) g.create(); + Paint borderPaint = getBorderColor(c); + if (borderPaint == null) { + return; + } + g2.setPaint(borderPaint); + FineUIUtils.paintPartRoundButtonBorder(c, g2, x, y, width, height, borderWidth, (float) getArc(c)); + } else { + super.paintBorder(c, g, x, y, width, height); + } + } + + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonGroupUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonGroupUI.java new file mode 100644 index 0000000000..bf59dda3a5 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonGroupUI.java @@ -0,0 +1,30 @@ +package com.fine.theme.light.ui; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.PanelUI; + +/** + * 按钮组UI，应用于 {@link com.fr.design.gui.ibutton.UIButtonGroup} + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/15 + */ +public class FineButtonGroupUI extends PanelUI { + + /** + * 创建UI + * + * @param c 组件 + * @return ComponentUI + */ + public static ComponentUI createUI(JComponent c) { + return new FineButtonGroupUI(); + } + + @Override + public void uninstallUI(JComponent c) { + super.uninstallUI(c); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonUI.java new file mode 100644 index 0000000000..73fb532f9b --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineButtonUI.java @@ -0,0 +1,114 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineClientProperties; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatButtonUI; +import com.formdev.flatlaf.ui.FlatUIUtils; + +import javax.swing.AbstractButton; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.geom.Path2D; + +import static com.fine.theme.utils.FineClientProperties.BUTTON_BORDER; + +/** + * 按钮UI + * + * @author vito + * @since 11.0 + * Created on 2023/12/20 + */ +public class FineButtonUI extends FlatButtonUI { + + /** + * @param shared + * @since 2 + */ + protected FineButtonUI(boolean shared) { + super(shared); + } + + /** + * 是否左圆角矩形 + * + * @param c 组件 + * @return 是否左圆角矩形 + */ + public static boolean isLeftRoundButton(Component c) { + return c instanceof JButton + && FineClientProperties.BUTTON_BORDER_LEFT_ROUND_RECT.equals(getButtonBorderTypeStr((JButton) c)); + } + + /** + * 是否右圆角矩形 + * + * @param c 组件 + * @return 是否右圆角矩形 + */ + public static boolean isRightRoundButton(Component c) { + return c instanceof JButton + && FineClientProperties.BUTTON_BORDER_RIGHT_ROUND_RECT.equals(getButtonBorderTypeStr((JButton) c)); + } + + /** + * 是否部分圆角矩形 + * + * @param c 组件 + * @return 是否部分圆角矩形 + */ + public static boolean isPartRoundButton(Component c) { + return isLeftRoundButton(c) || isRightRoundButton(c); + } + + protected void paintBackground(Graphics g, JComponent c) { + if (isPartRoundButton(c)) { + Color background = getBackground(c); + if (background == null) { + return; + } + + Graphics2D g2 = (Graphics2D) g.create(); + try { + FlatUIUtils.setRenderingHints(g2); + float arc = FlatUIUtils.getBorderArc(c); + int width = c.getWidth(); + int height = c.getHeight(); + + g2.setColor(FlatUIUtils.deriveColor(background, getBackgroundBase(c, false))); + Path2D path2DLeft; + if (isLeftRoundButton(c)) { + path2DLeft = FineUIUtils.createLeftRoundRectangle(0, 0, width, height, arc); + } else { + path2DLeft = FineUIUtils.createRightRoundRectangle(0, 0, width, height, arc); + } + g2.fill(path2DLeft); + } finally { + g2.dispose(); + } + } else { + super.paintBackground(g, c); + } + } + + /** + * 创建UI + */ + public static ComponentUI createUI(JComponent c) { + return new FineButtonUI(false); + } + + static String getButtonBorderTypeStr(AbstractButton c) { + Object value = c.getClientProperty(BUTTON_BORDER); + if (value instanceof String) { + return (String) value; + } + return null; + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineCheckBoxUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineCheckBoxUI.java new file mode 100644 index 0000000000..6077235bca --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineCheckBoxUI.java @@ -0,0 +1,37 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.ui.FlatCheckBoxUI; + +import javax.swing.AbstractButton; +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; + +/** + * 提供 {@link javax.swing.JCheckBox} 的UI类 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/14 + */ +public class FineCheckBoxUI extends FlatCheckBoxUI { + + public static ComponentUI createUI(JComponent c) { + return new FineCheckBoxUI(false); + } + + protected FineCheckBoxUI(boolean shared) { + super(shared); + } + + @Override + public void installDefaults(AbstractButton b) { + super.installDefaults(b); + b.setIcon(new LazyIcon("checkbox_unchecked")); + b.setSelectedIcon(new LazyIcon("checkbox_checked")); + b.setRolloverIcon(new LazyIcon("checkbox_hovered")); + b.setDisabledIcon(new LazyIcon("checkbox_unchecked").disabled()); + b.setDisabledSelectedIcon(new LazyIcon("checkbox_checked").disabled()); + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java new file mode 100644 index 0000000000..278848606d --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineColorButtonUI.java @@ -0,0 +1,66 @@ +package com.fine.theme.light.ui; + +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.fr.base.Utils; +import com.fr.design.gui.ibutton.UIColorButton; + +import javax.swing.ButtonModel; +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.geom.RoundRectangle2D; + +import static com.fine.theme.utils.FineUIScale.scale; + +/** + * 颜色按钮 + * + * @author vito + * @since 11.0 + * Created on 2024/1/3 + */ +public class FineColorButtonUI extends FineButtonUI { + + public static final float HEIGHT = 2.5f; + public static final float WIDTH = 14; + public static final float Y = 13.5f; + + /** + * @param shared + * @since 2 + */ + protected FineColorButtonUI(boolean shared) { + super(shared); + } + + /** + * 创建UI + */ + public static ComponentUI createUI(JComponent c) { + return new FineColorButtonUI(false); + } + + @Override + protected void paintIcon(Graphics g, JComponent c, Rectangle iconRect) { + super.paintIcon(g, c, iconRect); + UIColorButton b = (UIColorButton) c; + ButtonModel model = b.getModel(); + if (model.isEnabled()) { + g.setColor(b.getColor()); + } else { + g.setColor(new Color(Utils.filterRGB(b.getColor().getRGB(), 50))); + } + FlatUIUtils.setRenderingHints(g); + Graphics2D g2d = (Graphics2D) g; + float height = scale(HEIGHT); + float width = scale(WIDTH); + // 计算实际大小与icon区域大小的偏移，用于居中调整 + float offsetX = (iconRect.width - width) / 2.0f; + RoundRectangle2D.Float colorRect = new RoundRectangle2D.Float( + iconRect.x + offsetX, iconRect.y + scale(Y), width, height, height, height); + g2d.fill(colorRect); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineCombinationButtonUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineCombinationButtonUI.java new file mode 100644 index 0000000000..b2ab0f30a4 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineCombinationButtonUI.java @@ -0,0 +1,90 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineClientProperties; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatPanelUI; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.fr.design.gui.ibutton.UICombinationButton; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import java.awt.Color; +import java.awt.Graphics; +import java.beans.PropertyChangeEvent; + +import static com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; + +/** + * 双组件按钮UI + * + * @author vito + * @since 11.0 + * Created on 2023/12/21 + */ +public class FineCombinationButtonUI extends FlatPanelUI { + @Styleable(dot = true) + protected Color background; + + @Styleable(dot = true) + protected int arc; + + + /** + * @param shared + * @since 2 + */ + protected FineCombinationButtonUI(boolean shared) { + super(shared); + } + + /** + * 创建UI + * + * @param c 组件 + * @return ComponentUI + */ + public static ComponentUI createUI(JComponent c) { + return new FineCombinationButtonUI(false); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + background = FineUIUtils.getUIColor("CombinationButton.background", "desktop"); + arc = FineUIUtils.getUIInt("CombinationButton.arc", "Component.arc"); + } + + @Override + public void uninstallUI(JComponent c) { + super.uninstallUI(c); + } + + @Override + public void paint(Graphics g, JComponent c) { + paintBackground(g, c); + super.paint(g, c); + } + + protected void paintBackground(Graphics g, JComponent c) { + FlatUIUtils.setRenderingHints(g); + g.setColor(background); + g.fillRoundRect(0, 0, c.getWidth(), c.getHeight(), arc, arc); + } + + @Override + public void propertyChange(PropertyChangeEvent e) { + super.propertyChange(e); + switch (e.getPropertyName()) { + case FineClientProperties.STYLE_CLASS: + UICombinationButton b = (UICombinationButton) e.getSource(); + if (FineUIStyle.STYLE_PRIMARY.equals(e.getNewValue())) { + b.setPrimary(); + } + b.repaint(); + break; + default: + break; + } + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java new file mode 100644 index 0000000000..1e712238df --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java @@ -0,0 +1,67 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineClientProperties; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatComboBoxUI; +import com.formdev.flatlaf.ui.FlatUIUtils; +import org.jetbrains.annotations.Nullable; + +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.SwingConstants; +import javax.swing.plaf.ComponentUI; +import java.awt.Dimension; +import java.awt.Graphics2D; + +/** + * 提供 {@link javax.swing.JComboBox} 的UI类 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/07 + */ +public class FineComboBoxUI extends FlatComboBoxUI { + + public static ComponentUI createUI(JComponent c) { + return new FineComboBoxUI(); + } + + @Override + protected JButton createArrowButton() { + return new FineComboBoxButton(); + } + + protected class FineComboBoxButton extends FlatComboBoxButton { + + @Override + protected void paintArrow(Graphics2D g) { + if (isPopupVisible(comboBox)) { + setDirection(SwingConstants.NORTH); + } else { + setDirection(SwingConstants.SOUTH); + } + super.paintArrow(g); + } + } + + @Override + public Dimension getMinimumSize(JComponent c) { + // ComboBox基于子组件计算适配尺寸性能一般，仅考虑部分ComboBox进行适配计算，其他采用默认值 + if (FineClientProperties.ADAPTIVE_COMBO_BOX.equals(getComboBoxTypeStr(c))) { + return super.getMinimumSize(c); + } + return FineUIScale.scale(new Dimension( + FlatUIUtils.getUIInt("ComboBox.minimumWidth", 72), + FlatUIUtils.getUIInt("ComboBox.comboHeight", 24) + )); + } + + @Nullable + static String getComboBoxTypeStr(JComponent c) { + Object value = c.getClientProperty(FineClientProperties.COMBO_BOX_TYPE); + if (value instanceof String) { + return (String) value; + } + return null; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineGradientBarUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineGradientBarUI.java new file mode 100644 index 0000000000..a57f40c8bb --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineGradientBarUI.java @@ -0,0 +1,309 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatPanelUI; +import com.fr.design.style.background.gradient.GradientBar; +import com.fr.design.style.background.gradient.SelectColorPointBtn; +import com.fr.stable.AssistUtils; +import com.fr.stable.os.OperatingSystem; + +import javax.swing.JComponent; +import javax.swing.UIManager; +import javax.swing.plaf.ComponentUI; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.LinearGradientPaint; +import java.awt.RenderingHints; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionAdapter; +import java.awt.geom.Path2D; +import java.awt.geom.Point2D; +import java.util.Collections; +import java.util.List; + +/** + * 渐变色滑块 UI类 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/19 + */ +public class FineGradientBarUI extends FlatPanelUI { + + private int directionalShapeSize; + private int recHeight; + private int width; + private int height; + private int borderWidth; + private Color borderColor; + private Color thumbBorderColor; + private Color hoverThumbColor; + private Color pressedThumbColor; + + private MouseMotionAdapter mouseMotionListener; + + GradientBar gradientBar; + private List list; + private SelectColorPointBtn p1; + private SelectColorPointBtn p2; + private MouseListener mouseListener; + private double offset = 0.0001; + + boolean[] hoverStatus; + + protected FineGradientBarUI(boolean shared) { + super(shared); + } + + + /** + * 创建UI + * + * @param c 组件 + * @return UI + */ + public static ComponentUI createUI(JComponent c) { + return new FineGradientBarUI(false); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + installDefaults(c); + + gradientBar = (GradientBar) c; + mouseMotionListener = new TrackMotionListener(); + mouseListener = new TrackMouseListener(); + gradientBar.addMouseMotionListener(mouseMotionListener); + gradientBar.addMouseListener(mouseListener); + } + + private void installDefaults(JComponent c) { + directionalShapeSize = FineUIUtils.getAndScaleInt("GradientBar.thumbWidth", 12); + recHeight = FineUIUtils.getAndScaleInt("GradientBar.recHeight", 30); + width = FineUIUtils.getAndScaleInt("GradientBar.recWidth", 160); + height = recHeight + directionalShapeSize; + borderWidth = FineUIUtils.getAndScaleInt("GradientBar.borderWidth", 1); + borderColor = UIManager.getColor("GradientBar.borderColor"); + thumbBorderColor = UIManager.getColor("GradientBar.thumbBorderColor"); + hoverThumbColor = UIManager.getColor("GradientBar.hoverThumbColor"); + pressedThumbColor = UIManager.getColor("GradientBar.pressedThumbColor"); + } + + private class TrackMouseListener extends MouseAdapter { + @Override + public void mouseExited(MouseEvent e) { + for (int i = 0; i < list.size(); i++) { + SelectColorPointBtn selectColorPointBtn = list.get(i); + selectColorPointBtn.setHover(false); + hoverStatus[i] = false; + } + + gradientBar.repaint(); + } + + @Override + public void mouseEntered(MouseEvent e) { + checkHoverStatus(e); + } + + @Override + public void mousePressed(MouseEvent e) { + for (SelectColorPointBtn btn : list) { + boolean hover = isOverBtn(e, btn); + btn.setPressed(hover); + } + + gradientBar.repaint(); + } + + @Override + public void mouseReleased(MouseEvent e) { + for (SelectColorPointBtn btn : list) { + btn.setPressed(false); + } + + gradientBar.repaint(); + } + } + + + private class TrackMotionListener extends MouseMotionAdapter { + int index; + + @Override + public void mouseDragged(MouseEvent e) { + if (!gradientBar.isDraggable()) { + return; + } + index = getSelectedIndex(e, index); + int halfSize = directionalShapeSize / 2; + boolean x = e.getX() <= gradientBar.getWidth() - halfSize && e.getX() >= halfSize; + if (x) { + list.get(index).setStartPosition((double) (e.getX() - halfSize) / (gradientBar.getWidth() - directionalShapeSize)); + gradientBar.repaint(); + } + } + + private int getSelectedIndex(MouseEvent e, int index) { + int oldIndex = index; + + for (int i = 0; i < list.size(); i++) { + if (list.get(i).contains(e.getX(), e.getY())) { + index = i; + break; + } + } + + if (OperatingSystem.isLinux() && AssistUtils.equals(oldIndex, index)) { + if (Math.abs(p1.getX() - e.getX()) > Math.abs(p2.getX() - e.getX())) { + index = 1; + } else { + index = 0; + } + } + return index; + } + + @Override + public void mouseMoved(MouseEvent e) { + checkHoverStatus(e); + } + + } + + private void checkHoverStatus(MouseEvent e) { + boolean repaint = false; + for (int i = 0; i < list.size(); i++) { + SelectColorPointBtn btn = list.get(i); + boolean hover = isOverBtn(e, btn); + if (hoverStatus[i] != hover) { + repaint = true; + hoverStatus[i] = hover; + btn.setHover(hover); + } + } + + if (repaint) { + gradientBar.repaint(); + } + } + + private boolean isOverBtn(MouseEvent e, SelectColorPointBtn btn) { + return btn.contains(e.getX(), e.getY()); + } + + @Override + public void paint(Graphics g, JComponent c) { + Graphics2D g2 = (Graphics2D) g; + + + gradientBar = (GradientBar) c; + list = gradientBar.getList(); + p1 = gradientBar.getSelectColorPointBtnP1(); + p2 = gradientBar.getSelectColorPointBtnP2(); + if (hoverStatus == null) { + hoverStatus = new boolean[list.size()]; + } + + g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); + + GradientBar component = (GradientBar) c; + List btnList = component.getList(); + Collections.sort(btnList); + + + paintBorder(g2, component); + paintContent(g2, component); + paintButton(g2, btnList); + + } + + /** + * 实际绘制区域x范围（directionalShapeSize / 2, width - directionalShapeSize) + */ + private void paintContent(Graphics2D g2d, GradientBar c) { + List btnList = c.getList(); + + int halfSize = directionalShapeSize / 2; + Point2D start = new Point2D.Float(halfSize, 0); + Point2D end = new Point2D.Float(c.getWidth() - halfSize, 0); + + + Collections.sort(btnList); + Color[] colors = new Color[btnList.size()]; + for (int i = 0; i < btnList.size(); i++) { + colors[i] = btnList.get(i).getColorInner(); + } + + float[] dist = getColorFloats(c, btnList); + LinearGradientPaint paint = new LinearGradientPaint(start, end, dist, colors); + g2d.setPaint(paint); + g2d.fillRect(halfSize + borderWidth, borderWidth, c.getWidth() - directionalShapeSize - borderWidth * 2, recHeight - borderWidth * 2); + } + + private float[] getColorFloats(GradientBar c, List btnList) { + float[] dist = new float[btnList.size()]; + for (int i = 0; i < btnList.size(); i++) { + if (btnList.get(i).getStartPosition() < 0) { + dist[i] = 0; + } else if (btnList.get(i).getStartPosition() > 1) { + dist[i] = 1; + } else { + dist[i] = (float) btnList.get(i).getStartPosition(); + } + + btnList.get(i).setX(dist[i] * (c.getWidth() - directionalShapeSize) + (double) directionalShapeSize / 2); + btnList.get(i).setY(recHeight); + } + + float dist1 = dist[btnList.size() - 1]; + float dist2 = dist[btnList.size() - 2]; + if (AssistUtils.equals(dist1, dist2)) { + dist[btnList.size() - 1] = (float) (dist2 + offset); + } + return dist; + } + + private void paintBorder(Graphics2D g2d, GradientBar c) { + int halfSize = directionalShapeSize / 2; + if (borderColor == null) { + return; + } + g2d.setColor(borderColor); + g2d.fillRect(halfSize, 0, c.getWidth() - directionalShapeSize, recHeight); + } + + private void paintButton(Graphics2D g2d, List list) { + + for (SelectColorPointBtn selectColorPointBtn : list) { + Path2D directionalThumbShape = FineSliderUI.createDirectionalThumbShape((float) selectColorPointBtn.getX() - (float) directionalShapeSize / 2, (float) selectColorPointBtn.getY(), directionalShapeSize, directionalShapeSize, 0); + if (selectColorPointBtn.isHover() && hoverThumbColor != null) { + g2d.setColor(hoverThumbColor); + g2d.fill(directionalThumbShape); + } else if (selectColorPointBtn.isPressed() && pressedThumbColor != null) { + g2d.setColor(pressedThumbColor); + g2d.fill(directionalThumbShape); + } else if (thumbBorderColor != null) { + g2d.setColor(thumbBorderColor); + g2d.fill(directionalThumbShape); + } + selectColorPointBtn.updatePath(directionalThumbShape); + + Path2D innerThumbShape = FineSliderUI.createDirectionalThumbShape((float) selectColorPointBtn.getX() - (float) directionalShapeSize / 2 + borderWidth, (float) selectColorPointBtn.getY() + borderWidth, directionalShapeSize - borderWidth * 2, directionalShapeSize - borderWidth * 2, 0); + g2d.setColor(selectColorPointBtn.getColorInner()); + g2d.fill(innerThumbShape); + } + + } + + @Override + public Dimension getPreferredSize(JComponent c) { + return new Dimension(width, height); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineHeadGroupUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineHeadGroupUI.java new file mode 100644 index 0000000000..2047918bb2 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineHeadGroupUI.java @@ -0,0 +1,74 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.PanelUI; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics; + +import static com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; + +/** + * HeadGroup 的UI类 + * + * @author vito + * @since 11.0 + * Created on 2023/12/15 + */ +public class FineHeadGroupUI extends PanelUI { + + @Styleable(dot = true) + protected Color background; + + @Styleable(dot = true) + protected int arc; + + /** + * 创建UI + * + * @param c 组件 + * @return ComponentUI + */ + public static ComponentUI createUI(JComponent c) { + return new FineHeadGroupUI(); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + background = FineUIUtils.getUIColor("HeadGroup.background", "desktop"); + arc = FineUIUtils.getUIInt("HeadGroup.arc", "Component.arc"); + } + + + @Override + public void uninstallUI(JComponent c) { + super.uninstallUI(c); + } + + @Override + public Dimension getMinimumSize(JComponent component) { + return new Dimension(0, 0); + } + + @Override + public Dimension getMaximumSize(JComponent component) { + return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); + } + + @Override + public void update(Graphics g, JComponent c) { + paintBackground(g, c); + paint(g, c); + } + + protected void paintBackground(Graphics g, JComponent c) { + FlatUIUtils.setRenderingHints(g); + g.setColor(background); + g.fillRoundRect(0, 0, c.getWidth(), c.getHeight(), arc, arc); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java new file mode 100644 index 0000000000..4555096842 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java @@ -0,0 +1,112 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.AnimatedPainter; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.fr.design.foldablepane.HeaderPane; + +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.UIManager; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.PanelUI; +import java.awt.AlphaComposite; +import java.awt.Component; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.geom.AffineTransform; + +/** + * 标题组件UI + * + * @author vito + * @since 11.0 + * Created on 2024/1/29 + */ +public class FineHeaderPaneUI extends PanelUI implements AnimatedPainter { + + private Icon triangleRight; + + private static final int ICON_FIX = -2; + + /** + * 创建UI + * + * @param c 组件 + * @return ComponentUI + */ + public static ComponentUI createUI(JComponent c) { + return new FineHeaderPaneUI(); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + triangleRight = new LazyIcon("triangle_right"); + } + + @Override + public void uninstallUI(JComponent c) { + super.uninstallUI(c); + } + + @Override + public void paint(Graphics g, JComponent c) { + paintWithAnimation(c, g, c.getX(), c.getY(), c.getWidth(), c.getHeight()); + } + + @Override + public void paintAnimated(Component c, Graphics2D g, int x, int y, int width, int height, float[] animatedValues) { + Graphics2D g2d = (Graphics2D) g.create(); + HeaderPane headerPane = (HeaderPane) c; + g2d.setColor(c.getBackground()); + if (headerPane.isPressed()) { + g2d.setColor(UIManager.getColor("Button.pressedBackground")); + } + Insets insets = headerPane.getInsets(); + g2d.fillRect(0, insets.top / 2, + headerPane.getWidth(), headerPane.getHeight() - (insets.top + insets.bottom) / 2); + + int iconY = (headerPane.getHeight() - triangleRight.getIconHeight()) / 2; + + + // 动起来,旋转角度（弧度）,动画帧绘制开始 + double rotationAngle = Math.toRadians(90 * animatedValues[0]); + + // 设置旋转中心 + AffineTransform oldTransform = g2d.getTransform(); + // 折叠面板需要icon显示左边缘对齐，fix一下 + g2d.rotate(rotationAngle, FineUIScale.scale(ICON_FIX) + triangleRight.getIconWidth() / 2.0, + iconY + triangleRight.getIconHeight() / 2.0); + // 绘制旋转后的正方形 + triangleRight.paintIcon(c, g2d, FineUIScale.scale(ICON_FIX), iconY); + // 恢复原始的变换 + g2d.setTransform(oldTransform); + // ----- 动画帧绘制结束 ----- + + g2d.setFont(c.getFont().deriveFont(Font.BOLD)); + g2d.setPaint(c.getForeground()); + g2d.setComposite(AlphaComposite.SrcOver.derive(c.getForeground().getAlpha() / 255f)); + + FontMetrics metrics = g2d.getFontMetrics(); + int ascent = metrics.getAscent(); + int descent = metrics.getDescent(); + + float titleX = triangleRight.getIconWidth() + FineUIScale.scale(ICON_FIX) + + FineUIScale.scale(UIManager.getInt("ExpandablePane.HeaderPane.hGap")); + float titleY = (headerPane.getHeight() - (ascent + descent)) / 2.0f + ascent; + FlatUIUtils.setRenderingHints(g2d); + g2d.drawString(headerPane.getTitle(), titleX, titleY); + g2d.dispose(); + } + + @Override + public float[] getValues(Component c) { + HeaderPane headerPane = (HeaderPane) c; + return new float[]{headerPane.isShow() ? 1 : 0}; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineInputUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineInputUI.java new file mode 100644 index 0000000000..351dc98b59 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineInputUI.java @@ -0,0 +1,68 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatPanelUI; + +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.plaf.ComponentUI; +import java.beans.PropertyChangeEvent; + +/** + * Input输入框类组件 UI类 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/11 + */ +public class FineInputUI extends FlatPanelUI { + + private static final String ENABLED = "enabled"; + private static final String EDITABLE = "editable"; + private final int defaultArc = 5; + + public FineInputUI(boolean shared) { + super(shared); + } + + /** + * 创建UI + */ + public static ComponentUI createUI(JComponent c) { + return new FineInputUI(false); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + c.setBackground(UIManager.getColor("Input.background")); + c.setBorder(UIManager.getBorder("Input.border")); + } + + @Override + protected void installDefaults(JPanel p) { + super.installDefaults(p); + arc = FineUIUtils.getAndScaleInt("Input.arc", defaultArc); + } + + @Override + public void propertyChange(PropertyChangeEvent e) { + String propertyName = e.getPropertyName(); + if (EDITABLE.equals(propertyName) || ENABLED.equals(propertyName)) { + updateBackground(e); + } else { + super.propertyChange(e); + } + } + + private void updateBackground(PropertyChangeEvent e) { + JPanel source = (JPanel) e.getSource(); + if (e.getNewValue() == Boolean.FALSE) { + source.setBackground(UIManager.getColor("Input.disabledBackground")); + } else { + source.setBackground(UIManager.getColor("Input.background")); + } + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java new file mode 100644 index 0000000000..33fa2aecbd --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java @@ -0,0 +1,17 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.icon.JsonIconSet; +import com.fine.theme.icon.UrlIconResource; + +/** + * Fine 亮主题图标集 + * + * @author vito + * @since 11.0 + * Created on 2024/5/7 + */ +public class FineLightIconSet extends JsonIconSet { + public FineLightIconSet() { + super(new UrlIconResource("com/fine/theme/light/ui/fine_light.icon.json")); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuItemUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuItemUI.java new file mode 100644 index 0000000000..615a44f581 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuItemUI.java @@ -0,0 +1,80 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineClientProperties; +import com.formdev.flatlaf.ui.FlatMenuItemRenderer; +import com.formdev.flatlaf.ui.FlatMenuItemUI; + +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JMenuItem; +import javax.swing.plaf.ComponentUI; +import java.awt.Color; + +import java.awt.Font; + +import java.awt.Graphics; +import java.awt.Rectangle; + +/** + * menuItem UI类 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2024/1/8 + */ +public class FineMenuItemUI extends FlatMenuItemUI { + int iconSize = 16; + int rightMargin = 10; + + /** + * 创建UI + * + * @param c + * @return + */ + public static ComponentUI createUI(JComponent c) { + return new FineMenuItemUI(); + } + + @Override + protected FlatMenuItemRenderer createRenderer() { + return new FineMenuItemRenderer(menuItem, checkIcon, arrowIcon, acceleratorFont, acceleratorDelimiter); + } + + @Override + public void paint(Graphics g, JComponent c) { + super.paint(g, c); + + Object itemType = c.getClientProperty(FineClientProperties.MENU_ITEM_TYPE); + if (FineClientProperties.MENU_ITEM_TYPE_LOCK.equals(itemType)) { + LazyIcon icon = new LazyIcon("locked"); + + icon.paintIcon(c, g, c.getWidth() - rightMargin - iconSize, (c.getHeight() - iconSize) / 2); + } + } + + static class FineMenuItemRenderer extends FlatMenuItemRenderer { + protected FineMenuItemRenderer(JMenuItem menuItem, Icon checkIcon, Icon arrowIcon, + Font acceleratorFont, String acceleratorDelimiter ) + { + super(menuItem, checkIcon, arrowIcon, acceleratorFont, acceleratorDelimiter); + } + + @Override + protected void paintText( Graphics g, Rectangle textRect, String text, Color selectionForeground, Color disabledForeground ) { + if (!isTopLevelMenu(menuItem) && menuItem.getIcon() == null) { + textRect.x -= minimumIconSize.width; + } + super.paintText(g, textRect, text, selectionForeground, disabledForeground); + } + + @Override + protected void paintIcon(Graphics g, Rectangle iconRect, Icon icon, Color checkBackground, Color selectionBackground) { + if (menuItem.getIcon() != null) { + super.paintIcon(g, iconRect, icon, checkBackground, selectionBackground); + } + } + + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineOptionPaneUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineOptionPaneUI.java new file mode 100644 index 0000000000..517db0f72b --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineOptionPaneUI.java @@ -0,0 +1,38 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatOptionPaneUI; + +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.UIManager; +import javax.swing.plaf.ComponentUI; +import java.awt.Component; +import java.awt.Container; + +/** + * @author Renekton + * @since 2024/08/15 + * Created on 2024/08/15 + */ +public class FineOptionPaneUI extends FlatOptionPaneUI { + + /** + * 注册当前类的UI对象 + */ + public static ComponentUI createUI(JComponent c ) { + return new FineOptionPaneUI(); + } + + @Override + protected void addButtonComponents(Container container, Object[] buttons, + int initialIndex) { + super.addButtonComponents(container, buttons, initialIndex); + Component[] components = container.getComponents(); + for (Component component: components) { + if (UIManager.getString("OptionPane.okButtonText", optionPane.getLocale()).equals(((JButton) component).getText())) { + FineUIStyle.setStyle((JButton) component, FineUIStyle.STYLE_PRIMARY); + } + } + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java new file mode 100644 index 0000000000..735ddf81d7 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FinePanelUI.java @@ -0,0 +1,55 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatPanelUI; +import org.jetbrains.annotations.Nullable; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; + +import java.awt.Graphics; + +import static com.fine.theme.utils.FineClientProperties.PANEL_TYPE; +import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL; + +/** + * Panel 面板UI + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/08/02 + */ +public class FinePanelUI extends FlatPanelUI { + + /** + * @param shared + * @since 2 + */ + protected FinePanelUI(boolean shared) { + super(shared); + } + + /** + * 创建UI + */ + public static ComponentUI createUI(JComponent c) { + return new FinePanelUI(false); + } + + @Override + public void update(Graphics g, JComponent c) { + if (ROUNDED_PANEL.equals(getPanelTypeStr(c))) { + this.arc = FineUIUtils.getUIInt("Panel.arc", "Component.arc"); + } + super.update(g, c); + } + + @Nullable + static String getPanelTypeStr(JComponent p) { + Object value = p.getClientProperty(PANEL_TYPE); + if (value instanceof String) { + return (String) value; + } + return null; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuBorder.java b/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuBorder.java new file mode 100644 index 0000000000..63bf5e88e0 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuBorder.java @@ -0,0 +1,19 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatPopupMenuBorder; + +/** + * PopupMenu Border类 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/25 + */ +public class FinePopupMenuBorder extends FlatPopupMenuBorder { + + @Override + public int getArc() { + return FineUIUtils.getAndScaleInt("PopupMenu.arc", 5); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuSeparatorUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuSeparatorUI.java new file mode 100644 index 0000000000..f5708005d6 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuSeparatorUI.java @@ -0,0 +1,70 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatPopupMenuSeparatorUI; +import com.formdev.flatlaf.ui.FlatUIUtils; + +import javax.swing.JComponent; +import javax.swing.JSeparator; +import javax.swing.plaf.ComponentUI; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.geom.Rectangle2D; + +import static com.formdev.flatlaf.util.UIScale.scale; + +/** + * popup弹窗分割线UI + * + * @author Leo.Qin + * @since 11.0 + * Created on 2024/1/8 + */ +public class FinePopupMenuSeparatorUI extends FlatPopupMenuSeparatorUI { + protected Insets insets; + + /** + * @param shared + * @since 2 + */ + protected FinePopupMenuSeparatorUI(boolean shared) { + super(shared); + } + + /** + * 创建UI类 + * + * @param c + * @return + */ + public static ComponentUI createUI(JComponent c) { + return new FinePopupMenuSeparatorUI(false); + } + + @Override + protected void installDefaults(JSeparator s) { + super.installDefaults(s); + insets = FineUIUtils.getAndScaleUIInsets("PopupMenuSeparator.Insets", new Insets(0, 10, 0, 10)); + } + + @Override + public void paint(Graphics g, JComponent c) { + Graphics2D g2 = (Graphics2D) g.create(); + try { + FlatUIUtils.setRenderingHints(g2); + g2.setColor(c.getForeground()); + + float width = scale((float) stripeWidth); + float indent = scale((float) stripeIndent); + + if (((JSeparator) c).getOrientation() == JSeparator.VERTICAL) { + g2.fill(new Rectangle2D.Float(indent, insets.left, width - (insets.left + insets.right), c.getHeight())); + } else { + g2.fill(new Rectangle2D.Float(insets.left, indent, c.getWidth() - (insets.left + insets.right), width)); + } + } finally { + g2.dispose(); + } + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuUI.java new file mode 100644 index 0000000000..58a37da791 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FinePopupMenuUI.java @@ -0,0 +1,58 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatPopupMenuUI; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.geom.RoundRectangle2D; + +/** + * PopupMenu UI类 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/25 + */ +public class FinePopupMenuUI extends FlatPopupMenuUI { + private int arc; + private final int DEFAULT_ARC = 10; + + /** + * 创建UI + * + * @param c 组件 + * @return UI + */ + public static ComponentUI createUI(JComponent c) { + return new FinePopupMenuUI(); + } + + @Override + public void installDefaults() { + super.installDefaults(); + arc = FineUIUtils.getAndScaleInt("PopupMenu.arc", DEFAULT_ARC); + } + + @Override + public void paint(Graphics g, JComponent c) { + + // 绘制圆角矩形作为弹窗背景 + Graphics2D g2d = (Graphics2D) g; + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + RoundRectangle2D roundRect = new RoundRectangle2D.Double(0, 0, c.getWidth(), c.getHeight(), arc, arc); + g2d.setColor(c.getBackground()); + g2d.fill(roundRect); + + // 绘制组件内容 + super.paint(g, c); + } + + @Override + public void update(Graphics g, JComponent c) { + paint(g, c); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineReportComponentBorder.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineReportComponentBorder.java new file mode 100644 index 0000000000..6d381761ac --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineReportComponentBorder.java @@ -0,0 +1,28 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatRoundBorder; + +import javax.swing.UIManager; +import java.awt.Color; +import java.awt.Component; + +/** + * 报表编辑区域边框 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2024/1/2 + */ +public class FineReportComponentBorder extends FlatRoundBorder { + + @Override + protected int getArc(Component c) { + return FineUIUtils.getAndScaleInt("Center.arc", 10); + } + + @Override + protected Color getBorderColor(Component c) { + return UIManager.getColor("Center.ZoneBorderColor"); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineReportComponentCompositeUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineReportComponentCompositeUI.java new file mode 100644 index 0000000000..7886af3c33 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineReportComponentCompositeUI.java @@ -0,0 +1,40 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatPanelUI; + +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.plaf.ComponentUI; + +/** + * 报表编辑区域UI + * + * @author Leo.Qin + * @since 11.0 + * Created on 2024/1/2 + */ +public class FineReportComponentCompositeUI extends FlatPanelUI { + /** + * @param shared + * @since 2 + */ + protected FineReportComponentCompositeUI(boolean shared) { + super(shared); + } + + /** + * 创建UI + */ + public static ComponentUI createUI(JComponent c) { + return new FineReportComponentCompositeUI(false); + } + + @Override + protected void installDefaults(JPanel p) { + super.installDefaults(p); + this.arc = FineUIUtils.getAndScaleInt("Center.arc", 10); + } + + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineRoundBorder.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineRoundBorder.java new file mode 100644 index 0000000000..9538079996 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineRoundBorder.java @@ -0,0 +1,63 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatRoundBorder; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.fr.design.event.HoverAware; + +import java.awt.Color; +import java.awt.Component; +import java.awt.Paint; +import java.util.StringJoiner; + + +/** + * 通用的Border类，具备hover、click、禁用等多种状态 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/06 + */ +public class FineRoundBorder extends FlatRoundBorder { + + @Styleable(dot = true) + protected Color borderColor = FineUIUtils.getUIColor("defaultBorderColor", "Component.borderColor"); + @Styleable(dot = true) + protected Color disabledBorderColor = FineUIUtils.getUIColor("defaultBorderColor", "Component.disabledBorderColor"); + @Styleable(dot = true) + protected Color highlightBorderColor = FineUIUtils.getUIColor("defaultHighlightBorderColor", "Component.focusedBorderColor"); + @Styleable(dot = true) + protected Color focusColor = FineUIUtils.getUIColor("defaultBorderFocusShadow", "Component.focusedBorderColor"); + + @Override + protected Paint getBorderColor(Component c) { + if (isEnabled(c)) { + if (c instanceof HoverAware && ((HoverAware) c).isHovered()) { + return getHoverBorderColor(); + } else { + return isFocused(c) ? focusedBorderColor : borderColor; + } + } + return disabledBorderColor; + } + + @Override + protected Color getFocusColor(Component c) { + return focusColor; + } + + protected Color getHoverBorderColor() { + return highlightBorderColor; + } + + + @Override + public String toString() { + return new StringJoiner(", ", FineRoundBorder.class.getSimpleName() + "[", "]") + .add("borderColor=" + borderColor) + .add("arc=" + arc) + .add("roundRect=" + roundRect) + .add("borderWidth=" + borderWidth) + .toString(); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineSelectBoxUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineSelectBoxUI.java new file mode 100644 index 0000000000..b9bbcbcff5 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineSelectBoxUI.java @@ -0,0 +1,49 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.PanelUI; +import java.awt.Dimension; + +/** + * 选择框面板UI，应用于 {@link com.fr.design.style.AbstractSelectBox} + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/15 + */ +public class FineSelectBoxUI extends PanelUI { + + private static final int DEFAULT_BOX_HEIGHT = 24; + + protected int boxHeight; + + /** + * 创建UI + * + * @param c 组件 + * @return ComponentUI + */ + public static ComponentUI createUI(JComponent c) { + return new FineSelectBoxUI(); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + boxHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", DEFAULT_BOX_HEIGHT); + c.setBorder(new FineRoundBorder()); + } + + @Override + public void uninstallUI(JComponent c) { + super.uninstallUI(c); + } + + @Override + public Dimension getPreferredSize(JComponent c) { + return new Dimension(c.getWidth(), boxHeight); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineSliderUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineSliderUI.java new file mode 100644 index 0000000000..a8f150fb44 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineSliderUI.java @@ -0,0 +1,344 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatSliderUI; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.HiDPIUtils; +import com.formdev.flatlaf.util.UIScale; +import com.fr.stable.AssistUtils; + +import javax.swing.JComponent; +import javax.swing.JSlider; +import javax.swing.UIManager; +import javax.swing.plaf.ComponentUI; +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.geom.Ellipse2D; +import java.awt.geom.Path2D; +import java.awt.geom.RoundRectangle2D; +import java.util.Dictionary; +import java.util.Enumeration; + +/** + * 滑块slider UI类 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/15 + */ +public class FineSliderUI extends FlatSliderUI { + + private final int DEFAULT_LABEL_HEIGHT = 13; + private Color defaultForeground; + private int defaultLabelHeight; + + /** + * 创建UI + */ + public static ComponentUI createUI(JComponent c) { + return new FineSliderUI(); + } + + @Override + protected void installDefaults(JSlider slider) { + super.installDefaults(slider); + defaultForeground = UIManager.getColor("Slider.foreground"); + defaultLabelHeight = FineUIUtils.getAndScaleInt("Slider.labelHeight", DEFAULT_LABEL_HEIGHT); + } + + @Override + protected void calculateLabelRect() { + + if (slider.getPaintLabels()) { + calLabelRectWhenPaint(); + } else { + calLabelRectWhenNotPaint(); + } + } + + private void calLabelRectWhenPaint() { + labelRect.y = 0; + + if (slider.getOrientation() == JSlider.HORIZONTAL) { + labelRect.x = tickRect.x - trackBuffer; + labelRect.width = tickRect.width + (trackBuffer * 2); + labelRect.height = getHeightOfTallestLabel(); + } else { + if (isLeftToRight(slider)) { + labelRect.x = tickRect.x + tickRect.width; + labelRect.width = getWidthOfWidestLabel(); + } else { + labelRect.width = getWidthOfWidestLabel(); + labelRect.x = tickRect.x - labelRect.width; + } + labelRect.height = tickRect.height + (trackBuffer * 2); + } + } + + private void calLabelRectWhenNotPaint() { + labelRect.y = 0; + + if (slider.getOrientation() == JSlider.HORIZONTAL) { + labelRect.x = tickRect.x; + labelRect.width = tickRect.width; + labelRect.height = 0; + } else { + if (isLeftToRight(slider)) { + labelRect.x = tickRect.x + tickRect.width; + } else { + labelRect.x = tickRect.x; + } + labelRect.width = 0; + labelRect.height = tickRect.height; + } + } + + @Override + protected void calculateTrackRect() { + if (slider.getOrientation() == JSlider.HORIZONTAL) { + calHorizontalTrackRect(); + } else { + calVerticalTrackRect(); + } + } + + private void calVerticalTrackRect() { + int centerSpacing; + centerSpacing = thumbRect.width; + if (isLeftToRight(slider)) { + if (slider.getPaintTicks()) { + centerSpacing += getTickLength(); + } + if (slider.getPaintLabels()) { + centerSpacing += getWidthOfWidestLabel(); + } + } else { + if (slider.getPaintTicks()) { + centerSpacing -= getTickLength(); + } + if (slider.getPaintLabels()) { + centerSpacing -= getWidthOfWidestLabel(); + } + } + trackRect.x = contentRect.x + getWidthOfWidestLabel() + (contentRect.width - centerSpacing - 1) / 2; + trackRect.y = contentRect.y + trackBuffer; + trackRect.width = thumbRect.width; + trackRect.height = contentRect.height - (trackBuffer * 2); + } + + private void calHorizontalTrackRect() { + int centerSpacing; + centerSpacing = thumbRect.height; + if (slider.getPaintTicks()) { + centerSpacing += getTickLength(); + } + + if (slider.getPaintLabels()) { + centerSpacing += getHeightOfTallestLabel(); + } + trackRect.x = contentRect.x + trackBuffer; + trackRect.y = contentRect.y + getHeightOfTallestLabel() + (contentRect.height - centerSpacing - 1) / 2; + trackRect.width = contentRect.width - (trackBuffer * 2); + trackRect.height = thumbRect.height; + } + + @Override + protected int getHeightOfTallestLabel() { + Dictionary dictionary = slider.getLabelTable(); + int tallest = 0; + if (dictionary != null) { + Enumeration keys = dictionary.keys(); + while (keys.hasMoreElements()) { + JComponent label = (JComponent) dictionary.get(keys.nextElement()); + tallest = Math.max(label.getPreferredSize().height, tallest); + } + } + return Math.min(tallest, defaultLabelHeight); + } + + @Override + protected int getWidthOfWidestLabel() { + Dictionary dictionary = slider.getLabelTable(); + int widest = 0; + if (dictionary != null) { + Enumeration keys = dictionary.keys(); + while (keys.hasMoreElements()) { + JComponent label = (JComponent) dictionary.get(keys.nextElement()); + widest = Math.max(label.getPreferredSize().width, widest); + } + } + return Math.min(widest, defaultLabelHeight); + } + + /** + * Convenience function for determining ComponentOrientation. Helps us + * avoid having Munge directives throughout the code. + */ + static boolean isLeftToRight(Component c) { + return c.getComponentOrientation().isLeftToRight(); + } + + @Override + public void paintThumb(Graphics g) { + Color thumbColor = getThumbColor(); + Color color = stateColor(slider, thumbHover, thumbPressed, thumbColor, disabledThumbColor, null, hoverThumbColor, pressedThumbColor); + color = FlatUIUtils.deriveColor(color, thumbColor); + + Color foreground = slider.getForeground(); + Color borderColor = (thumbBorderColor != null && foreground == defaultForeground) ? stateColor(slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null) : null; + + Color focusedColor = FlatUIUtils.deriveColor(this.focusedColor, (foreground != defaultForeground) ? foreground : focusBaseColor); + + paintThumb(g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, thumbBorderWidth, focusWidth); + } + + /** + * Paints the thumb. + * + * @param g the graphics context + * @param slider the slider + * @param thumbRect the thumb rectangle + * @param roundThumb whether the thumb should be round + * @param thumbColor the thumb color + * @param thumbBorderColor the thumb border color + * @param focusedColor the focused color + * @param thumbBorderWidth the thumb border width + * @param focusWidth the focus width + */ + public static void paintThumb(Graphics g, JSlider slider, Rectangle thumbRect, boolean roundThumb, Color thumbColor, Color thumbBorderColor, Color focusedColor, float thumbBorderWidth, int focusWidth) { + double systemScaleFactor = UIScale.getSystemScaleFactor((Graphics2D) g); + int scaleFactor2 = 2; + if (systemScaleFactor != 1 && systemScaleFactor != scaleFactor2) { + // paint at scale 1x to avoid clipping on right and bottom edges at 125%, 150% or 175% + HiDPIUtils.paintAtScale1x((Graphics2D) g, thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height, (g2d, x2, y2, width2, height2, scaleFactor) -> { + paintThumbImpl(g, slider, x2, y2, width2, height2, roundThumb, thumbColor, thumbBorderColor, focusedColor, (float) (thumbBorderWidth * scaleFactor), (float) (focusWidth * scaleFactor)); + }); + return; + } + + paintThumbImpl(g, slider, thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height, roundThumb, thumbColor, thumbBorderColor, focusedColor, thumbBorderWidth, focusWidth); + + } + + private static void paintThumbImpl(Graphics g, JSlider slider, int x, int y, int width, int height, boolean roundThumb, Color thumbColor, Color thumbBorderColor, Color focusedColor, float thumbBorderWidth, float focusWidth) { + int fw = Math.round(UIScale.scale(focusWidth)); + int tx = x + fw; + int ty = y + fw; + int tw = width - fw - fw; + int th = height - fw - fw; + boolean focused = FlatUIUtils.isPermanentFocusOwner(slider); + + if (roundThumb) { + paintRoundThumb(g, x, y, width, height, thumbColor, thumbBorderColor, focusedColor, thumbBorderWidth, focused, tx, ty, tw, th); + } else { + paintDirectionalThumb(g, slider, x, y, width, height, thumbColor, thumbBorderColor, focusedColor, thumbBorderWidth, tw, th, focused, fw); + } + } + + private static void paintDirectionalThumb(Graphics g, JSlider slider, int x, int y, int width, int height, Color thumbColor, Color thumbBorderColor, Color focusedColor, float thumbBorderWidth, int tw, int th, boolean focused, int fw) { + Graphics2D g2 = (Graphics2D) g.create(); + try { + g2.translate(x, y); + if (slider.getOrientation() == JSlider.VERTICAL) { + if (slider.getComponentOrientation().isLeftToRight()) { + g2.translate(0, height); + g2.rotate(Math.toRadians(270)); + } else { + g2.translate(width, 0); + g2.rotate(Math.toRadians(90)); + } + + // rotate thumb width/height + int temp = tw; + tw = th; + th = temp; + } + + paintDirectionalThumbImpl(thumbColor, thumbBorderColor, focusedColor, thumbBorderWidth, tw, th, focused, fw, g2); + } finally { + g2.dispose(); + } + } + + private static void paintDirectionalThumbImpl(Color thumbColor, Color thumbBorderColor, Color focusedColor, float thumbBorderWidth, int tw, int th, boolean focused, int fw, Graphics2D g2) { + // paint thumb focus border + if (focused) { + g2.setColor(focusedColor); + g2.fill(createDirectionalThumbShape(0, 0, tw + fw + fw, th + fw + fw, fw)); + } + + if (thumbBorderColor != null) { + // paint thumb border + g2.setColor(thumbBorderColor); + g2.fill(createDirectionalThumbShape(fw, fw, tw, th, 0)); + + // paint thumb background + float lw = UIScale.scale(thumbBorderWidth); + g2.setColor(thumbColor); + g2.fill(createDirectionalThumbShape(fw + lw, fw + lw, tw - lw - lw, th - lw - lw, 0)); + } else { + // paint thumb background + g2.setColor(thumbColor); + g2.fill(createDirectionalThumbShape(fw, fw, tw, th, 0)); + } + } + + private static void paintRoundThumb(Graphics g, int x, int y, int width, int height, Color thumbColor, Color thumbBorderColor, Color focusedColor, float thumbBorderWidth, boolean focused, int tx, int ty, int tw, int th) { + // paint thumb focus border + if (focused) { + g.setColor(focusedColor); + ((Graphics2D) g).fill(createRoundThumbShape(x, y, width, height)); + } + + if (thumbBorderColor != null) { + // paint thumb border + g.setColor(thumbBorderColor); + ((Graphics2D) g).fill(createRoundThumbShape(tx, ty, tw, th)); + + // paint thumb background + float lw = UIScale.scale(thumbBorderWidth); + g.setColor(thumbColor); + ((Graphics2D) g).fill(createRoundThumbShape(tx + lw, ty + lw, tw - lw - lw, th - lw - lw)); + } else { + // paint thumb background + g.setColor(thumbColor); + ((Graphics2D) g).fill(createRoundThumbShape(tx, ty, tw, th)); + } + } + + /** + * 无标签下创建圆形Thumb形状 + */ + public static Shape createRoundThumbShape(float x, float y, float w, float h) { + if (AssistUtils.equals(w, h)) { + return new Ellipse2D.Float(x, y, w, h); + } else { + float arc = Math.min(w, h); + return new RoundRectangle2D.Float(x, y, w, h, arc, arc); + } + } + + /** + * 有标签下创建Thumb形状 + */ + public static Path2D createDirectionalThumbShape(float x, float y, float w, float h, float arc) { + + float wh = w / 2; + Path2D path = new Path2D.Float(Path2D.WIND_NON_ZERO, 9); + path.moveTo(x + wh, y); // 移到反转后的位置 + path.lineTo(x, y + wh); // 线到反转后的位置 + path.lineTo(x, y + h - arc); // 线到反转后的位置 + path.quadTo(x, y + h, x + arc, y + h); // 贝塞尔曲线到反转后的位置 + path.lineTo(x + (w - arc), y + h); // 线到反转后的位置 + path.quadTo(x + w, y + h, x + w, y + h - arc); // 贝塞尔曲线到反转后的位置 + path.lineTo(x + w, y + wh); // 线到反转后的位置 + path.closePath(); // 关闭路径 + + return path; + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java new file mode 100644 index 0000000000..e129e77349 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineTableHeaderUI.java @@ -0,0 +1,108 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatTableHeaderUI; +import com.fr.stable.StringUtils; +import sun.swing.DefaultLookup; + +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.SwingConstants; +import javax.swing.UIManager; +import javax.swing.border.Border; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.UIResource; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.JTableHeader; +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; + +/** + * 应用于 JTable 的UI + * + * @author lemon + * @since + * Created on + */ +public class FineTableHeaderUI extends FlatTableHeaderUI { + protected static Color selectionBackground = UIManager.getColor("Table.background"); + + @Override + public void installUI(JComponent c) { + super.installUI(c); + JTableHeader header = (JTableHeader) c; + header.setDefaultRenderer(new TableHeaderRenderer()); + JTable table = header.getTable(); + + if (table != null) { + table.setDefaultRenderer(Object.class, new TableRenderer()); + } + } + + + @Override + public void paint(Graphics g, JComponent c) { + FineUIStyle.setStyle(((JTableHeader) c).getTable(), FineUIStyle.DEFAULT_TABLE); + super.paint(g, c); + } + + /** + * 表头 render + */ + public static class TableHeaderRenderer extends DefaultTableCellRenderer implements UIResource { + public TableHeaderRenderer() { + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + Border border = DefaultLookup.getBorder(this, this.ui, "TableHeader.cellBorder"); + this.setText(value == null ? "" : value.toString()); + this.setHorizontalAlignment(SwingConstants.LEFT); + this.setBorder(border); + return this; + } + } + + + /** + * UI + * @param c + * @return + */ + public static ComponentUI createUI(JComponent c) { + return new FineTableHeaderUI(); + } + + /** + * 表身 render + */ + public static class TableRenderer extends DefaultTableCellRenderer { + public TableRenderer() { + setHorizontalAlignment(SwingConstants.LEFT); + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + Class columnClass = table.getColumnClass(0); + Border border; + if (column == table.getColumnCount() - 1) { + border = BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor")), + UIManager.getBorder("Table.cellNoFocusBorder")); + } else { + border = BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor")), + UIManager.getBorder("Table.cellNoFocusBorder")); + } + if (isSelected && columnClass != Boolean.class) { + selectionBackground = UIManager.getColor( "Table.selectionBackground"); + } else { + selectionBackground = UIManager.getColor("Table.background"); + } + setBackground(selectionBackground); + setText(value == null ? StringUtils.BLANK : String.valueOf(value)); + setBorder(border); + return this; + } + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineTableScrollBarPaneUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineTableScrollBarPaneUI.java new file mode 100644 index 0000000000..0da29904ca --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineTableScrollBarPaneUI.java @@ -0,0 +1,53 @@ +package com.fine.theme.light.ui; + +import com.formdev.flatlaf.ui.FlatScrollBarUI; +import com.fr.design.gui.iscrollbar.UIVerticalScrollBar; + +import javax.swing.JComponent; +import javax.swing.JTable; +import javax.swing.plaf.ComponentUI; +import java.awt.Graphics; +import java.awt.Rectangle; + +/** + * 应用于 JTable 的垂直滚动条UI + * + * @author lemon + * @since + * Created on 2024/08/11 + */ +public class FineTableScrollBarPaneUI extends FlatScrollBarUI { + + public FineTableScrollBarPaneUI() { + } + + /** + * 创建UI + * + * @param c 组件 + * @return ComponentUI + */ + public static ComponentUI createUI(JComponent c) { + return new FineTableScrollBarPaneUI(); + } + + + @Override + protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds) { + super.paintTrack(g, c, trackBounds); + } + + @Override + protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds) { + if (c instanceof UIVerticalScrollBar) { + // 确保滚动条滑块不会超过表头区域 + JTable table = ((UIVerticalScrollBar) c).getTable(); + Rectangle headerRect = table.getTableHeader().getBounds(); + int headerHeight = headerRect.height; + thumbBounds.y = Math.max(thumbBounds.y, headerHeight); + } + + super.paintThumb(g, c, thumbBounds); + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateListMenuItemUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateListMenuItemUI.java new file mode 100644 index 0000000000..063b2982db --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateListMenuItemUI.java @@ -0,0 +1,52 @@ +package com.fine.theme.light.ui; + +import com.formdev.flatlaf.ui.FlatUIUtils; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.PanelUI; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.geom.RoundRectangle2D; + +/** + * 模版列表菜单ui + * + * @author vito + * @since 11.0 + * Created on 2024/1/11 + */ +public class FineTemplateListMenuItemUI extends PanelUI { + /** + * 创建UI + * + * @param c 组件 + * @return ComponentUI + */ + public static ComponentUI createUI(JComponent c) { + return new FineTemplateListMenuItemUI(); + } + + @Override + public void update(Graphics g, JComponent c) { + Color color = g.getColor(); + g.setColor(c.getBackground()); + Insets insets = c.getInsets(); + Object[] old = FlatUIUtils.setRenderingHints(g); + ((Graphics2D) g).fill(new RoundRectangle2D.Float( + insets.left, insets.top, + (float) c.getWidth() - insets.left - insets.right, + (float) c.getHeight() - insets.top - insets.bottom, + 3, 3)); + g.setColor(color); + FlatUIUtils.resetRenderingHints(g, old); + super.paint(g, c); + } + + @Override + public void uninstallUI(JComponent c) { + super.uninstallUI(c); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateTabPaneUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateTabPaneUI.java new file mode 100644 index 0000000000..05225dd602 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineTemplateTabPaneUI.java @@ -0,0 +1,396 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.fr.base.GraphHelper; +import com.fr.base.vcs.DesignerMode; +import com.fr.design.file.MultiTemplateTabPane; +import com.fr.stable.collections.combination.Pair; + +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.PanelUI; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FontMetrics; +import java.awt.GradientPaint; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.geom.Path2D; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; + +import static com.fine.theme.utils.FineUIScale.scale; +import static com.fine.theme.utils.FineUIUtils.paintRoundTabBorder; +import static com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import static com.fr.design.file.MultiTemplateTabPane.leadingWidth; +import static com.fr.design.file.MultiTemplateTabPane.TRAILING_WIDTH; + +/** + * 文件Tab栏UI + * + * @author vito + * @since 11.0 + * Created on 2023/12/27 + */ +public class FineTemplateTabPaneUI extends PanelUI { + private MultiTemplateTabPane tabPane; + + private static final String ELLIPSIS = "..."; + private static final int ICON_TEXT_GAP = 4; + + @Styleable(dot = true) + protected Color background; + + @Styleable(dot = true) + protected Color selectedBackground; + + @Styleable(dot = true) + protected Color hoverColor; + + @Styleable(dot = true) + protected Color closeIconHoverBackground; + + @Styleable(dot = true) + protected Color closeHoverBackground; + + @Styleable(dot = true) + protected Color borderColor; + + @Styleable(dot = true) + protected int tabHeight; + + @Styleable(dot = true) + protected int separatorHeight; + + @Styleable(dot = true) + protected int borderWidth; + + @Styleable(dot = true) + protected int tabArc; + + @Styleable(dot = true) + protected Insets tabInsets; + + protected Icon fileIcon; + protected Icon moreAction; + protected Icon addAction; + protected Icon moreHoverAction; + + + private Icon closeIcon; + + private Icon closeHoverIcon; + + private int trailingWidth; + + protected FineTemplateTabPaneUI() { + + } + + /** + * 创建UI + * + * @param c 组件 + * @return ComponentUI + */ + public static ComponentUI createUI(JComponent c) { + return new FineTemplateTabPaneUI(); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + this.tabPane = (MultiTemplateTabPane) c; + closeIcon = new LazyIcon("clear"); + closeHoverIcon = new LazyIcon("clear_hover"); + addAction = new LazyIcon("add_worksheet"); + moreAction = new LazyIcon("tool_more"); + moreHoverAction = new LazyIcon("tool_more_hover"); + fileIcon = new LazyIcon("cpt_icon"); + trailingWidth = scale(TRAILING_WIDTH); + + borderWidth = FineUIUtils.getUIInt("TemplateTabPane.borderWidth", "TemplateTabPane.borderWidth"); + tabArc = FineUIUtils.getUIInt("TemplateTabPane.tabArc", "TemplateTabPane.tabArc"); + background = FineUIUtils.getUIColor("TemplateTabPane.background", "TabbedPane.background"); + selectedBackground = FineUIUtils.getUIColor("TemplateTabPane.selectedBackground", "TemplateTabPane.selectedBackground"); + closeHoverBackground = FineUIUtils.getUIColor("TemplateTabPane.closeHoverBackground", "TemplateTabPane.closeHoverBackground"); + borderColor = FineUIUtils.getUIColor("TemplateTabPane.borderColor", "TabbedPane.tabSeparatorColor"); + hoverColor = FineUIUtils.getUIColor("TemplateTabPane.hoverColor", "TemplateTabPane.hoverColor"); + closeIconHoverBackground = FineUIUtils.getUIColor("TemplateTabPane.icon.hoverBackground ", "TemplateTabPane.icon.hoverBackground "); + // ---- scaled ---- + tabInsets = FineUIUtils.getAndScaleUIInsets("TemplateTabPane.tabInsets", new Insets(4, 6, 4, 6)); + tabHeight = FineUIUtils.getAndScaleInt("TemplateTabPane.tabHeight", "TabbedPane.tabHeight"); + separatorHeight = FineUIUtils.getAndScaleInt("TemplateTabPane.separatorHeight", "TemplateTabPane.separatorHeight"); + } + + @Override + public void uninstallUI(JComponent c) { + super.uninstallUI(c); + } + + + @Override + public void update(Graphics g, JComponent c) { + super.update(g, c); + double maxWidth = c.getWidth() - scale(leadingWidth) - trailingWidth; + Graphics2D g2d = (Graphics2D) g; + paintDefaultBackground(g2d); + paintPaneUnderLine(c.getWidth(), g2d); + paintTabs(g2d, maxWidth); + } + + private void paintDefaultBackground(Graphics2D g2d) { + //画默认背景 + g2d.setPaint(new GradientPaint(0, 0, tabPane.getBackground(), 1, (float) (tabHeight), tabPane.getBackground())); + g2d.fillRect(0, 0, tabPane.getWidth(), tabHeight); + } + + private void paintPaneUnderLine(float w, Graphics2D g2d) { + g2d.setPaint(borderColor); + float h = (float) tabHeight; + int t = scale(borderWidth); + Path2D border = new Path2D.Float(Path2D.WIND_EVEN_ODD); + border.append(FlatUIUtils.createComponentRectangle(0, 0, w, h, 0), false); + border.append(FlatUIUtils.createComponentRectangle(0, 0, w, h - t, 0), false); + g2d.fill(border); + } + + private void paintTabs(Graphics2D g2d, double maxWidth) { + + int maxStringlength = calculateStringMaxLength(); + if (tabPane.getSelectedIndex() >= tabPane.getTabCount()) { + tabPane.setSelectedIndex(tabPane.getTabCount() - 1); + } + if (tabPane.getSelectedIndex() < 0) { + tabPane.setSelectedIndex(0); + } + double templateStartX = scale(leadingWidth); + + + //从可以开始展示在tab面板上的tab开始画 + Pair viewRange = tabPane.getViewRange(); + for (int i = viewRange.getFirst(); i <= viewRange.getSecond(); i++) { + Icon icon = tabPane.getTemplateIconByIndex(i); + String name = tabPane.getTemplateShowNameByIndex(i); + //如果tab名字的长度大于最大能显示的英文字符长度，则进行省略号处理 + if (getStringWidth(name) > maxStringlength) { + name = getEllipsisName(name, maxStringlength); + } + + + Icon tabcloseIcon = tabPane.isCloseCurrent(i) ? closeHoverIcon : closeIcon; + if (i == tabPane.getSelectedIndex()) { + paintSelectedTab(g2d, icon, templateStartX, name, tabcloseIcon); + } else { + paintUnSelectedTab(g2d, icon, templateStartX, name, tabcloseIcon, + tabPane.getHoverIndex(), i); + } + templateStartX += tabPane.getTabWidth(); + } + + paintSeparators(g2d); + + if (!DesignerMode.isVcsMode()) { + paintTrailingAction(g2d, maxWidth); + } + } + + private void paintSeparators(Graphics2D g2d) { + g2d.setPaint(borderColor); + float x = scale(leadingWidth); + Pair viewRange = tabPane.getViewRange(); + for (int i = viewRange.getFirst(); i <= viewRange.getSecond(); i++) { + if (i != tabPane.getSelectedIndex() + && i + 1 != tabPane.getSelectedIndex()) { + paintSeparator(g2d, x); + } + x += tabPane.getTabWidth(); + } + } + + + private void paintTrailingAction(Graphics2D g2d, double tabPaneWidth) { + int x = scale(leadingWidth) + (int) tabPaneWidth + (trailingWidth - moreAction.getIconWidth()) / 2; + int y = (tabHeight - moreAction.getIconHeight()) / 2; + if (tabPane.isHoverMoreAction()) { + moreHoverAction.paintIcon(tabPane, g2d, x, y); + } else { + moreAction.paintIcon(tabPane, g2d, x, y); + } + + } + + /** + * 判断tab文字的长度大于能装下的最大文字长度，要用省略号 + * + * @param name + * @param maxStringlength + * @return + */ + private String getEllipsisName(String name, int maxStringlength) { + + int ellipsisWidth = getStringWidth(ELLIPSIS); + int leftkeyPoint = 0; + int rightKeyPoint = name.length() - 1; + int leftStrWidth = 0; + int rightStrWidth = 0; + while (leftStrWidth + rightStrWidth + ellipsisWidth < maxStringlength) { + if (leftStrWidth <= rightStrWidth) { + leftkeyPoint++; + } else { + rightKeyPoint--; + } + leftStrWidth = getStringWidth(name.substring(0, leftkeyPoint)); + rightStrWidth = getStringWidth(name.substring(rightKeyPoint)); + + if (leftStrWidth + rightStrWidth + ellipsisWidth > maxStringlength) { + if (leftStrWidth <= rightStrWidth) { + rightKeyPoint++; + } else { + leftkeyPoint--; + } + break; + } + } + return name.substring(0, leftkeyPoint) + ELLIPSIS + name.substring(rightKeyPoint); + } + + /** + * 计算过长度之后的每个tab的能接受的文字的英文字符数 + * + * @return + */ + private int calculateStringMaxLength() { + return tabPane.getTabWidth() + - tabInsets.left - tabInsets.right + - ICON_TEXT_GAP * 2 + - fileIcon.getIconWidth() - closeIcon.getIconWidth(); + + } + + private int getStringWidth(String str) { + FontMetrics fm = GraphHelper.getFontMetrics(tabPane.getFont()); + int size = 0; + for (int i = 0; i < str.length(); i++) { + size += fm.charWidth(str.codePointAt(i)); + } + return size; + } + + + /** + * 画选中的tab + * + * @param g2d + * @param sheeticon + * @param templateStartX + * @param sheetName + * @param closeIcon + * @return + */ + private void paintSelectedTab(Graphics2D g2d, Icon sheeticon, double templateStartX, String sheetName, Icon closeIcon) { + Object[] oriRenderingHints = FlatUIUtils.setRenderingHints(g2d); + // 绘制选中背景 + g2d.setPaint(selectedBackground); + Path2D tabShape = FineUIUtils.createTopRoundRectangle(templateStartX, 0, + tabPane.getTabWidth(), tabHeight, tabArc); + g2d.fill(tabShape); + // 绘制选中边框 + g2d.setPaint(borderColor); + paintRoundTabBorder(g2d, templateStartX, 0, + tabPane.getTabWidth(), tabHeight, borderWidth, (float) tabArc); + + // 绘制字符 + g2d.setPaint(tabPane.getForeground()); + Point2D.Double textPoint = calTextPoint(templateStartX, sheeticon.getIconWidth()); + g2d.drawString(sheetName, (int) textPoint.x, (int) textPoint.y); + + FlatUIUtils.resetRenderingHints(g2d, oriRenderingHints); + + // 绘制图标 + int sheetIconY = (tabHeight - sheeticon.getIconHeight()) / 2; + sheeticon.paintIcon(tabPane, g2d, (int) templateStartX + tabInsets.left, sheetIconY); + + int closePosition = (int) templateStartX + tabPane.getTabWidth() + - this.closeIcon.getIconWidth() - tabInsets.right; + int closeY = (tabHeight - closeIcon.getIconHeight()) / 2; + if (!DesignerMode.isVcsMode()) { + closeIcon.paintIcon(tabPane, g2d, closePosition, closeY); + } + } + + private Point2D.Double calTextPoint(double x, int iconWidth) { + FontMetrics fm = tabPane.getFontMetrics(tabPane.getFont()); + int ascent = fm.getAscent(); + int gap = (tabHeight - tabInsets.top - tabInsets.bottom - ascent) / 2; + double y = tabInsets.top + ascent + gap; + return new Point2D.Double(x + iconWidth + tabInsets.left + ICON_TEXT_GAP, y); + } + + + /** + * 画没有选中的tab + * + * @param g2d + * @param sheeticon + * @param templateStartX + * @param sheetName + * @param closeIcon + */ + private void paintUnSelectedTab(Graphics2D g2d, Icon sheeticon, double templateStartX, String sheetName, Icon closeIcon, int mouseOveredIndex, int selfIndex) { + if (selfIndex == mouseOveredIndex) { + g2d.setPaint(hoverColor); + } else { + g2d.setPaint(background); + } + + Object[] oriRenderingHints = FlatUIUtils.setRenderingHints(g2d); + + Path2D tabShape = FineUIUtils.createTopRoundRectangle(templateStartX, 0, + tabPane.getTabWidth(), tabHeight - scale(borderWidth), tabArc); + g2d.fill(tabShape); + + // 画字符 + g2d.setPaint(tabPane.getForeground()); + Point2D.Double textPoint = calTextPoint(templateStartX, sheeticon.getIconWidth()); + g2d.drawString(sheetName, (int) textPoint.x, (int) textPoint.y); + + FlatUIUtils.resetRenderingHints(g2d, oriRenderingHints); + + // 画图标 + int sheetIconY = (tabHeight - sheeticon.getIconHeight()) / 2; + sheeticon.paintIcon(tabPane, g2d, (int) templateStartX + tabInsets.left, sheetIconY); + int closeY = (tabHeight - closeIcon.getIconHeight()) / 2; + int closePosition = (int) templateStartX + tabPane.getTabWidth() + - this.closeIcon.getIconWidth() - tabInsets.right; + if (!DesignerMode.isVcsMode()) { + closeIcon.paintIcon(tabPane, g2d, closePosition, closeY); + } + } + + private void paintSeparator(Graphics2D g2d, float templateStartX) { + float x = templateStartX + tabPane.getTabWidth(); + float gap = (tabHeight - separatorHeight) / 2.0f; + g2d.fill(new Rectangle2D.Float(x, gap, scale(borderWidth), tabHeight - gap * 2)); + } + + + @Override + public Dimension getPreferredSize(JComponent c) { + return new Dimension(c.getWidth(), tabHeight); + } + + @Override + public Dimension getMinimumSize(JComponent c) { + return new Dimension(0, tabHeight); + } + + @Override + public Dimension getMaximumSize(JComponent c) { + return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineToggleButtonUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineToggleButtonUI.java new file mode 100644 index 0000000000..ad28f76f8c --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineToggleButtonUI.java @@ -0,0 +1,218 @@ +package com.fine.theme.light.ui; + + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable; +import com.formdev.flatlaf.ui.FlatToggleButtonUI; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.fr.design.gui.ibutton.UIButton; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.AbstractButton; +import javax.swing.JComponent; +import javax.swing.JToggleButton; +import javax.swing.UIManager; +import javax.swing.plaf.ComponentUI; +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Shape; +import java.awt.Rectangle; + +import static com.fine.theme.utils.FineClientProperties.BUTTON_TYPE_GROUP; +import static com.fine.theme.utils.FineClientProperties.BUTTON_TYPE; +import static com.fine.theme.utils.FineClientProperties.BUTTON_TYPE_TAB; +import static com.fine.theme.utils.FineClientProperties.BUTTON_GROUP_POSITION; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_INNER; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_LEFT; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_LEFT_BOTTOM; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_LEFT_TOP; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_RIGHT; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_RIGHT_BOTTOM; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_RIGHT_TOP; +import static com.fine.theme.utils.FineClientProperties.TAB_BUTTON_SELECTED_BACKGROUND; +import static com.formdev.flatlaf.FlatClientProperties.clientPropertyColor; +import static com.formdev.flatlaf.FlatClientProperties.clientPropertyInt; + +/** + * 提供 {@link javax.swing.JToggleButton} 的UI类 + *

+ * + * @author vito + * @uiDefault ToggleButton.tab.arc int + * @since 11.0 + * Created on 2023/11/3 + */ +public class FineToggleButtonUI extends FlatToggleButtonUI { + + @Styleable(dot = true) + protected int tabArc; + + @Styleable(dot = true) + protected Color groupBackground; + + @Styleable(dot = true) + protected Color groupSelectedBackground; + + @Styleable(dot = true) + protected Color groupSelectedForeground; + + public static ComponentUI createUI(JComponent c) { + return FlatUIUtils.canUseSharedUI(c) + ? FlatUIUtils.createSharedUI(FlatToggleButtonUI.class, () -> new FineToggleButtonUI(true)) + : new FineToggleButtonUI(false); + } + + protected FineToggleButtonUI(boolean shared) { + super(shared); + } + + @Override + protected void installDefaults(AbstractButton b) { + super.installDefaults(b); + tabArc = UIManager.getInt("ToggleButton.tab.arc"); + groupBackground = FineUIUtils.getUIColor("ToggleButton.group.background", "ToggleButton.background"); + groupSelectedBackground = FineUIUtils.getUIColor("ToggleButton.group.selectedBackground", "ToggleButton.selectedBackground"); + groupSelectedForeground = FineUIUtils.getUIColor("ToggleButton.group.selectedForeground", "ToggleButton.selectedForeground"); + } + + + @Nullable + static String getButtonTypeStr(AbstractButton c) { + Object value = c.getClientProperty(BUTTON_TYPE); + if (value instanceof String) + return (String) value; + return null; + } + + static int getGroupButtonPosition(AbstractButton c) { + return clientPropertyInt(c, BUTTON_GROUP_POSITION, GROUP_BUTTON_POSITION_INNER); + } + + static boolean isTabButton(Component c) { + return c instanceof JToggleButton && BUTTON_TYPE_TAB.equals(getButtonTypeStr((JToggleButton) c)); + } + + static boolean isGroupButton(Component c) { + return c instanceof UIButton && BUTTON_TYPE_GROUP.equals(getButtonTypeStr((UIButton) c)); + } + + @Override + public void paint(Graphics g, JComponent c) { + if (isGroupButton(c) || isTabButton(c)) { + ((AbstractButton)c).setMargin(FineUIUtils.getUIInsets("ToggleButton.compact.margin", "ToggleButton.margin")); + } + super.paint(g, c); + } + + @Override + protected void paintBackground(Graphics g, JComponent c) { + if (isTabButton(c)) { + paintTabButton(g, c); + } else if (isGroupButton(c)) { + paintGroupButton(g, c); + } else { + super.paintBackground(g, c); + } + } + + protected void paintTabButton(Graphics g, JComponent c) { + int height = c.getHeight(); + int width = c.getWidth(); + boolean selected = ((AbstractButton) c).isSelected(); + + // paint background + Color background; + if(c.isEnabled() && selected) { + background = tabSelectedBackground; + } else { + Color enabledColor = selected ? clientPropertyColor(c, TAB_BUTTON_SELECTED_BACKGROUND, tabSelectedBackground) : null; + // use component background if explicitly set + if (enabledColor == null) { + Color bg = c.getBackground(); + if (isCustomBackground(bg)) { + enabledColor = bg; + } + } + background = buttonStateColor(c, enabledColor, + null, tabFocusBackground, tabHoverBackground, null); + } + + if (background != null) { + g.setColor(background); + g.fillRoundRect(0, 0, width, height, tabArc, tabArc); + } + } + + protected void paintGroupButton(Graphics g, JComponent c) { + Color background = getBackground(c); + if (background == null) { + return; + } + Graphics2D g2 = (Graphics2D) g.create(); + try { + FlatUIUtils.setRenderingHints(g2); + g2.setColor(FlatUIUtils.deriveColor(background, getBackgroundBase(c, true))); + + int position = getGroupButtonPosition((AbstractButton) c); + if (position == GROUP_BUTTON_POSITION_INNER) { + float focusWidth = FlatUIUtils.getBorderFocusWidth(c); + FlatUIUtils.paintComponentBackground(g2, 0, 0, c.getWidth(), c.getHeight(), focusWidth, 0); + } else { + float arc = FlatUIUtils.getBorderArc( c ) / 2; + Shape path2D = getGroupButtonPath2D(c, position, arc); + g2.fill(path2D); + } + } finally { + g2.dispose(); + } + } + + @NotNull + private static Shape getGroupButtonPath2D(JComponent c, int position, float arc) { + Shape path2D; + switch (position) { + case GROUP_BUTTON_POSITION_LEFT: + path2D = FineUIUtils.createLeftRoundRectangle(0, 0, c.getWidth(), c.getHeight(), arc); + break; + case GROUP_BUTTON_POSITION_RIGHT: + path2D = FineUIUtils.createRightRoundRectangle(0, 0, c.getWidth(), c.getHeight(), arc); + break; + case GROUP_BUTTON_POSITION_LEFT_TOP: + path2D = FineUIUtils.createTopLeftRoundRectangle(0, 0, c.getWidth(), c.getHeight(), arc); + break; + case GROUP_BUTTON_POSITION_LEFT_BOTTOM: + path2D = FineUIUtils.createBottomLeftRoundRectangle(0, 0, c.getWidth(), c.getHeight(), arc); + break; + case GROUP_BUTTON_POSITION_RIGHT_TOP: + path2D = FineUIUtils.createTopRightRoundRectangle(0, 0, c.getWidth(), c.getHeight(), arc); + break; + case GROUP_BUTTON_POSITION_RIGHT_BOTTOM: + path2D = FineUIUtils.createBottomRightRoundRectangle(0, 0, c.getWidth(), c.getHeight(), arc); + break; + default: + path2D = new Rectangle(); + } + return path2D; + } + + @Override + protected Color getForeground(JComponent c) { + if (isGroupButton(c) && ((AbstractButton)c).isSelected()) { + return groupSelectedForeground; + } + return super.getForeground(c); + } + + @Override + protected Color getBackground(JComponent c) { + if (isGroupButton(c)) { + return ((AbstractButton)c).isSelected() ? groupSelectedBackground : groupBackground; + } + return super.getBackground(c); + } + +} + diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineTooltipUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineTooltipUI.java new file mode 100644 index 0000000000..b839c52c9f --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineTooltipUI.java @@ -0,0 +1,102 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatToolTipUI; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.fr.base.BaseUtils; +import com.fr.stable.Constants; + +import javax.swing.JComponent; +import javax.swing.JToolTip; +import javax.swing.SwingUtilities; +import javax.swing.plaf.ComponentUI; +import java.awt.Dimension; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.RenderingHints; +import java.util.List; + +/** + * ToolTip UI类 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/8 + */ +public class FineTooltipUI extends FlatToolTipUI { + private final int defaultMaxWidth = 392; + private final int defaultArc = 5; + private int maxWidth; + private int arc; + private List lines; + + /** + * 创建UI + */ + public static ComponentUI createUI(JComponent c) { + return FlatUIUtils.createSharedUI(FineTooltipUI.class, FineTooltipUI::new); + } + + @Override + public void paint(Graphics g, JComponent c) { + Graphics2D g2d = (Graphics2D) g; + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + + g2d.setColor(c.getBackground()); + g2d.fillRoundRect(0, 0, c.getWidth(), c.getHeight(), arc, arc); + + String text = ((JToolTip) c).getTipText(); + if (text == null || text.isEmpty()) { + return; + } + + Insets insets = c.getInsets(); + FontMetrics fm = g2d.getFontMetrics(); + + int x = insets.left; + int y = insets.top + fm.getAscent(); + + g2d.setColor(c.getForeground()); + + for (String line : lines) { + g2d.drawString(line, x, y); + y += fm.getHeight(); + } + + } + + + @Override + protected void installDefaults(JComponent c) { + super.installDefaults(c); + c.setOpaque(false); + arc = FineUIScale.scale(FineUIUtils.getAndScaleInt("ToolTip.arc", defaultArc)); + maxWidth = FineUIUtils.getAndScaleInt("ToolTip.maxWidth", defaultMaxWidth); + } + + + @Override + public Dimension getPreferredSize(JComponent c) { + String text = ((JToolTip) c).getTipText(); + if (text == null || text.isEmpty()) { + return new Dimension(); + } + + Insets insets = c.getInsets(); + int fontWidth = this.maxWidth - insets.left - insets.right; + lines = BaseUtils.getLineTextList(text, null, null, fontWidth, Constants.FR_PAINT_RESOLUTION); + + FontMetrics fm = c.getFontMetrics(c.getFont()); + + int width = 0; + int height = fm.getHeight() * Math.max(lines.size(), 1); + for (String line : lines) { + width = Math.max(width, SwingUtilities.computeStringWidth(fm, line)); + } + + return new Dimension(insets.left + width + insets.right, insets.top + height + insets.bottom); + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/RectangleButtonUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/RectangleButtonUI.java new file mode 100644 index 0000000000..d904832c71 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/RectangleButtonUI.java @@ -0,0 +1,64 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatButtonUI; +import com.formdev.flatlaf.ui.FlatUIUtils; + +import javax.swing.AbstractButton; +import javax.swing.JComponent; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; + +/** + * 矩形按钮UI，忽略圆角属性 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/11/30 + */ +public class RectangleButtonUI extends FlatButtonUI { + + + public RectangleButtonUI(boolean shared) { + super(shared); + } + + + @Override + protected void installDefaults(AbstractButton b) { + super.installDefaults(b); + selectedBackground = FineUIUtils.getUIColor( "East.TabSelectedColor", "fill.deep"); + } + + @Override + protected void paintBackground(Graphics g, JComponent c) { + Color background = getBackground(c); + if (background == null) { + return; + } + Graphics2D g2 = (Graphics2D) g.create(); + try { + FlatUIUtils.setRenderingHints(g2); + g2.setColor(FlatUIUtils.deriveColor(background, getBackgroundBase(c, true))); + float focusWidth = FlatUIUtils.getBorderFocusWidth(c); + FlatUIUtils.paintComponentBackground(g2, 0, 0, c.getWidth(), c.getHeight(), focusWidth, 0); + } finally { + g2.dispose(); + } + } + + @Override + protected Color getBackground(JComponent c) { + if( ((AbstractButton)c).isSelected() ) { + return selectedBackground; + } + return buttonStateColor( c, + getBackgroundBase( c, false ), + disabledBackground, + isCustomBackground( c.getBackground() ) ? null : focusedBackground, + hoverBackground, + pressedBackground ); + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/ReportScrollBarUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/ReportScrollBarUI.java new file mode 100644 index 0000000000..650dccfbd6 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/ReportScrollBarUI.java @@ -0,0 +1,92 @@ +package com.fine.theme.light.ui; + +import com.formdev.flatlaf.ui.FlatScrollBarUI; +import com.formdev.flatlaf.ui.FlatUIUtils; + +import javax.swing.JComponent; +import javax.swing.JButton; +import javax.swing.UIManager; +import javax.swing.plaf.ComponentUI; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; + +/** + * 应用于主面板报表工作区的滚动条UI，提供给 {@link com.fr.design.cell.bar.DynamicScrollBar} 的UI类 + * + * @author Levy.Xie + * @since 11.0` + * Created on 2023/12/08 + */ +public class ReportScrollBarUI extends FlatScrollBarUI { + + /** + * 创建UI类 + * + * @param c 组件 + * @return ReportScrollBarUI + */ + public static ComponentUI createUI(JComponent c) { + return new ReportScrollBarUI(); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); + scrollBarWidth = UIManager.getInt("ScrollBar.largeBar.width"); + thumbInsets = UIManager.getInsets("ScrollBar.largeBar.thumbInsets"); + showButtons = UIManager.getBoolean("ScrollBar.largeBar.showButtons"); + trackColor = UIManager.getColor("ScrollBar.largeBar.track"); + } + + @Override + public void uninstallUI(JComponent c) { + super.uninstallUI(c); + } + + @Override + protected JButton createDecreaseButton(int orientation) { + return new ReportScrollBarButton(orientation); + } + + @Override + protected JButton createIncreaseButton(int orientation) { + return new ReportScrollBarButton(orientation); + } + + protected class ReportScrollBarButton extends FlatScrollBarButton { + + protected final Color defaultButtonBackground = UIManager.getColor("ScrollBar.largeBar.buttonBackground"); + + protected ReportScrollBarButton(int direction) { + super(direction); + } + + @Override + public void paint(Graphics g) { + Object[] oldRenderingHints = FlatUIUtils.setRenderingHints(g); + + // paint hover or pressed background + if (isEnabled()) { + Color background = (pressedBackground != null && isPressed()) + ? pressedBackground + : (hoverBackground != null && isHover() + ? hoverBackground + : null); + + if (background == null) { + background = defaultButtonBackground; + } + g.setColor(deriveBackground(background)); + paintBackground((Graphics2D) g); + } + + // paint arrow + g.setColor(deriveForeground(getArrowColor())); + paintArrow((Graphics2D) g); + + FlatUIUtils.resetRenderingHints(g, oldRenderingHints); + } + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/UIFlatTreeUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/UIFlatTreeUI.java new file mode 100644 index 0000000000..2b9a12852e --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/UIFlatTreeUI.java @@ -0,0 +1,32 @@ +package com.fine.theme.light.ui; + +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.ui.FlatTreeUI; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; + +/** + * 主题化的TreeUI，继承自FlatTreeUI + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/11/29 + */ +public class UIFlatTreeUI extends FlatTreeUI { + + /** + * 创建组件UI + * @param x 组件 + * @return 返回组件UI + */ + public static ComponentUI createUI(JComponent x) { + return new UIFlatTreeUI(); + } + + protected void installDefaults() { + super.installDefaults(); + setExpandedIcon(new LazyIcon("minus")); + setCollapsedIcon(new LazyIcon("plus")); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineDarkLaf.java b/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineDarkLaf.java new file mode 100644 index 0000000000..e568f5af32 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineDarkLaf.java @@ -0,0 +1,52 @@ +package com.fine.theme.light.ui.laf; + +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.IconManager; +import com.fine.theme.light.ui.FineLightIconSet; +import com.formdev.flatlaf.util.UIScale; +import com.fr.stable.StringUtils; + +/** + * Fine 暗色主题 + * + * @author vito + * @since 11.0 + * Created on 2023/9/12 + */ +public class FineDarkLaf extends FineLaf { + + private static final String USER_SCALE_FACTOR = "userScaleFactor"; + + private static final String NAME = "FineLaf Dark"; + + /** + * 安装外观 + * + * @return 是否安装成功 + */ + public static boolean setup() { + IconManager.addSet(new FineLightIconSet()); + Layouts.setScaleFactor(UIScale.getUserScaleFactor()); + UIScale.addPropertyChangeListener(evt -> { + if (StringUtils.equals(evt.getPropertyName(), USER_SCALE_FACTOR)) { + Layouts.setScaleFactor((float) evt.getNewValue()); + } + }); + return setup(new FineDarkLaf()); + } + + @Override + public String getName() { + return NAME; + } + + @Override + public String getDescription() { + return "Fine New Dark Look and Feel"; + } + + @Override + public boolean isDark() { + return true; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineLaf.java b/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineLaf.java new file mode 100644 index 0000000000..edb038dd0f --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineLaf.java @@ -0,0 +1,56 @@ +package com.fine.theme.light.ui.laf; + +import com.formdev.flatlaf.FlatLaf; +import com.formdev.flatlaf.util.SystemInfo; + +import javax.swing.PopupFactory; + +/** + * Fine designer new look and feel + * FineLaf.properties 定义公共属性，如UI等， + * 其他主题继承该主题进行自定义，防止出现UI不存在等问题 + * + * @author vito + * @since 11.0 + * Created on 2023/12/18 + */ +public abstract class FineLaf extends FlatLaf { + + private static final String NAME = "FineLaf"; + + + @Override + public String getName() { + return NAME; + } + + @Override + public String getDescription() { + return "Fine New Look and Feel"; + } + + @Override + public void initialize() { + super.initialize(); + resetWindowDecorations(); + // flat默认使用系统弹窗，3.4版本mac及win11上支持圆角边框和阴影效果 + // popup弹窗不使用flat提供的工具，使用swing原生自带的 + if (shouldUseNativePopupFactory()) { + PopupFactory.setSharedInstance(new PopupFactory()); + } + } + + private static boolean shouldUseNativePopupFactory() { + return !SystemInfo.isMacOS && !SystemInfo.isWindows_11_orLater; + } + + /** + * 在win10和win11下重置窗口装饰，恢复系统原生 + */ + private static void resetWindowDecorations() { + if (SystemInfo.isWindows_10_orLater) { + System.setProperty("flatlaf.useWindowDecorations", "false"); + System.setProperty("flatlaf.menuBarEmbedded", "false"); + } + } +} diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineLightLaf.java b/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineLightLaf.java new file mode 100644 index 0000000000..9e95b76f7e --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/light/ui/laf/FineLightLaf.java @@ -0,0 +1,52 @@ +package com.fine.theme.light.ui.laf; + +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.IconManager; +import com.fine.theme.light.ui.FineLightIconSet; +import com.formdev.flatlaf.util.UIScale; +import com.fr.stable.StringUtils; + +/** + * Fine 亮色主题 + * + * @author vito + * @since 11.0 + * Created on 2023/9/12 + */ +public class FineLightLaf extends FineLaf { + + public static final String USER_SCALE_FACTOR = "userScaleFactor"; + + private static final String NAME = "FineLaf Light"; + + /** + * 安装外观 + * + * @return 是否安装成功 + */ + public static boolean setup() { + IconManager.addSet(new FineLightIconSet()); + Layouts.setScaleFactor(UIScale.getUserScaleFactor()); + UIScale.addPropertyChangeListener(evt -> { + if (StringUtils.equals(evt.getPropertyName(), USER_SCALE_FACTOR)) { + Layouts.setScaleFactor((float) evt.getNewValue()); + } + }); + return setup(new FineLightLaf()); + } + + @Override + public String getName() { + return NAME; + } + + @Override + public String getDescription() { + return "Fine New Light Look and Feel"; + } + + @Override + public boolean isDark() { + return false; + } +} diff --git a/designer-base/src/main/java/com/fine/theme/utils/AnimatedPainter.java b/designer-base/src/main/java/com/fine/theme/utils/AnimatedPainter.java new file mode 100644 index 0000000000..5f1bcc4aa3 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/AnimatedPainter.java @@ -0,0 +1,131 @@ +package com.fine.theme.utils; + +import com.formdev.flatlaf.util.Animator.Interpolator; +import com.formdev.flatlaf.util.CubicBezierEasing; + +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Graphics2D; + +/** + * Painter 可在组件值更改时自动对绘画进行动画处理。 + * getValues(Component) 返回组件的值。如果值已更改，则 paintAnimated(Component, Graphics2D, int, int, int, int, float[]) + * 使用动画值（从旧值到新值）多次调用。如果 getValues(Component) 返回多个值，则每个值都有自己独立的动画。 + * 仅当传递给 paintWithAnimation(Component, Graphics, int, int, int, int) 的组件是 的 JComponent实例时，动画才有效。 + * 在组件上设置客户端属性以存储动画状态。 + * + * @author vito + * @since 11.0 + * Created on 2024/1/29 + */ +public interface AnimatedPainter { + /** + * 开始绘画。调用 paintAnimated(Component, Graphics2D, int, int, int, int, float[]) 一次来绘制当前值 + * 或者如果值与上次绘制相比发生了变化，则它会启动动画并使用动画值（从旧值到新值）多次调用 + * paintAnimated(Component, Graphics2D, int, int, int, int, float[]) 。 + * + * @param c 动画所属组件 + * @param g 绘制上下文 + * @param x x + * @param y y + * @param width 区域宽度 + * @param height 区域高度 + */ + default void paintWithAnimation(Component c, Graphics g, int x, int y, int width, int height) { + AnimatedPainterSupport.paint(this, c, g, x, y, width, height); + } + + /** + * 绘制给定的（动画）值。 + * 从 paintWithAnimation(Component, Graphics, int, int, int, int)调用。 + * + * @param c 动画所属组件 + * @param g 绘制上下文 + * @param x x + * @param y y + * @param width 区域宽度 + * @param height 区域高度 + * @param animatedValues 动画值，介于先前的值 getValues(Component) 和返回的最新值 getValues(Component) 之间 + */ + void paintAnimated(Component c, Graphics2D g, int x, int y, int width, int height, float[] animatedValues); + + /** + * 从 animator 调用以重新绘制区域。 + * 用于限制重绘区域。例如，如果希望只有底部边框有动画。如果对多个边框进行动画处理（例如底部和右侧），那么单独的重绘是没有意义的， + * 因为 Swing 重绘管理器会合并区域并重绘整个组件。默认实现会重新绘制整个给定区域。 + */ + default void repaintDuringAnimation(Component c, int x, int y, int width, int height) { + c.repaint(x, y, width, height); + } + + /** + * 获取组件的值。 + * 如果值发生更改，则此类将从旧值动画到新值。如果返回多个值，则每个值都有自己独立的动画。 + * 对于切换按钮，0 表示关闭和 1 表示打开 + */ + float[] getValues(Component c); + + /** + * 动画是否启用 + */ + default boolean isAnimationEnabled() { + return true; + } + + /** + * 返回动画的持续时间（以毫秒为单位）（默认值为 150）。 + */ + default int getAnimationDuration() { + return 150; + } + + /** + * 返回动画的分辨率（以毫秒为单位）（默认值为 10）。分辨率是计时事件之间的时间量。 + */ + default int getAnimationResolution() { + return 10; + } + + /** + * 返回动画的插值器。默认值为 {@link CubicBezierEasing#STANDARD_EASING}. + */ + default Interpolator getAnimationInterpolator() { + return CubicBezierEasing.STANDARD_EASING; + } + + /** + * 返回给定值索引和值的动画持续时间（以毫秒为单位）（默认值为 150）。 + */ + default int getAnimationDuration(int valueIndex, float value) { + return getAnimationDuration(); + } + + /** + * 返回给定值索引和值的动画分辨率（以毫秒为单位）（默认值为 10）。分辨率是计时事件之间的时间量 + */ + default int getAnimationResolution(int valueIndex, float value) { + return getAnimationResolution(); + } + + /** + * 返回给定值索引和值的动画插值器。默认值为 {@link CubicBezierEasing#STANDARD_EASING}. + */ + default Interpolator getAnimationInterpolator(int valueIndex, float value) { + return getAnimationInterpolator(); + } + + /** + * 返回用于存储动画支持的客户端属性键。 + */ + default Object getClientPropertyKey() { + return getClass(); + } + + /** + * 保存位置，提供给 repaintDuringAnimation(Component, int, int, int, int)使用重新绘制动画区域。 + * 仅当传递到的 paintWithAnimation(Component, Graphics, int, int, int, int) 图形上下文使用转换的位置时才需要。 + */ + static void saveRepaintLocation(AnimatedPainter painter, Component c, int x, int y) { + AnimatedPainterSupport.saveRepaintLocation(painter, c, x, y); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/utils/AnimatedPainterSupport.java b/designer-base/src/main/java/com/fine/theme/utils/AnimatedPainterSupport.java new file mode 100644 index 0000000000..b13a741f82 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/AnimatedPainterSupport.java @@ -0,0 +1,174 @@ +package com.fine.theme.utils; + +import com.formdev.flatlaf.util.Animator; + +import javax.swing.JComponent; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Graphics2D; + +/** + * 动画支持类，用于存储动画状态并实现动画。 + * 逻辑保持与AnimatedIcon逻辑一致。 + * + * @author vito + * @since 12.0 + * Created on 2024/1/29 + */ +class AnimatedPainterSupport { + private int valueIndex; + private float startValue; + private float targetValue; + private float animatedValue; + private float fraction; + + private Animator animator; + + // last bounds of the paint area needed to repaint while animating + private int x; + private int y; + private int width; + private int height; + + /** + * 用于包内绘制，保持与AnimatedIcon逻辑一致。 + * 后期整合逻辑之后在整理代码质量 + */ + static void paint(AnimatedPainter painter, Component c, Graphics g, + int x, int y, int width, int height) { + if (!isAnimationEnabled(painter, c)) { + // paint without animation if animation is disabled or + // component is not a JComponent and therefore does not support + // client properties, which are required to keep animation state + painter.paintAnimated(c, (Graphics2D) g, x, y, width, height, painter.getValues(c)); + return; + } + + // get component values + float[] values = painter.getValues(c); + + JComponent jc = (JComponent) c; + Object key = painter.getClientPropertyKey(); + AnimatedPainterSupport[] ass = (AnimatedPainterSupport[]) jc.getClientProperty(key); + + // check whether length of values array has changed + if (ass != null && ass.length != values.length) { + // cancel all running animations + for (AnimatedPainterSupport as : ass) { + if (as.animator != null) { + as.animator.cancel(); + } + } + ass = null; + } + + if (ass == null) { + ass = new AnimatedPainterSupport[values.length]; + jc.putClientProperty(key, ass); + } + + for (int i = 0; i < ass.length; i++) { + AnimatedPainterSupport as = ass[i]; + float value = values[i]; + + if (as == null) { + // painted first time --> do not animate, but remember current component value + as = new AnimatedPainterSupport(); + as.valueIndex = i; + as.startValue = as.targetValue = as.animatedValue = value; + ass[i] = as; + } else if (value != as.targetValue) { + // value changed --> (re)start animation + + int animationDuration = painter.getAnimationDuration(as.valueIndex, value); + + // do not animate if animation duration (for current value) is zero + if (animationDuration <= 0) { + if (as.animator != null) { + as.animator.cancel(); + as.animator = null; + } + as.startValue = as.targetValue = as.animatedValue = value; + as.fraction = 0; + continue; + } + + if (as.animator == null) { + // create animator + AnimatedPainterSupport as2 = as; + as.animator = new Animator(1, fraction -> { + // check whether component was removed while animation is running + if (!c.isDisplayable()) { + as2.animator.stop(); + return; + } + + // compute animated value + as2.animatedValue = as2.startValue + ((as2.targetValue - as2.startValue) * fraction); + as2.fraction = fraction; + + // repaint + painter.repaintDuringAnimation(c, as2.x, as2.y, as2.width, as2.height); + }, () -> { + as2.startValue = as2.animatedValue = as2.targetValue; + as2.animator = null; + }); + } + + if (as.animator.isRunning()) { + // if animation is still running, restart it from the current + // animated value to the new target value with reduced duration + as.animator.cancel(); + int duration2 = (int) (animationDuration * as.fraction); + if (duration2 > 0) { + as.animator.setDuration(duration2); + } + as.startValue = as.animatedValue; + } else { + // new animation + as.animator.setDuration(animationDuration); + + as.animatedValue = as.startValue; + } + + // update animator for new value + as.animator.setResolution(painter.getAnimationResolution(as.valueIndex, value)); + as.animator.setInterpolator(painter.getAnimationInterpolator(as.valueIndex, value)); + + // start animation + as.targetValue = value; + as.animator.start(); + } + + as.x = x; + as.y = y; + as.width = width; + as.height = height; + } + + float[] animatedValues = new float[ass.length]; + for (int i = 0; i < ass.length; i++) { + animatedValues[i] = ass[i].animatedValue; + } + + painter.paintAnimated(c, (Graphics2D) g, x, y, width, height, animatedValues); + } + + private static boolean isAnimationEnabled(AnimatedPainter painter, Component c) { + return Animator.useAnimation() && painter.isAnimationEnabled() && c instanceof JComponent; + } + + static void saveRepaintLocation(AnimatedPainter painter, Component c, int x, int y) { + if (!isAnimationEnabled(painter, c)) { + return; + } + + AnimatedPainterSupport[] ass = (AnimatedPainterSupport[]) ((JComponent) c).getClientProperty(painter.getClientPropertyKey()); + if (ass != null) { + for (AnimatedPainterSupport as : ass) { + as.x = x; + as.y = y; + } + } + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineClientProperties.java b/designer-base/src/main/java/com/fine/theme/utils/FineClientProperties.java new file mode 100644 index 0000000000..3b1e5933b2 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/FineClientProperties.java @@ -0,0 +1,43 @@ +package com.fine.theme.utils; + +import com.formdev.flatlaf.FlatClientProperties; + +/** + * FR-UI中使用的各类属性 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/15 + */ +public interface FineClientProperties extends FlatClientProperties { + + //--------------------------- ButtonGroup ----------------------- + String BUTTON_TYPE_GROUP = "group"; + + String BUTTON_BORDER = "buttonBorder"; + String BUTTON_BORDER_LEFT_ROUND_RECT = "leftRoundRect"; + String BUTTON_BORDER_RIGHT_ROUND_RECT = "rightRoundRect"; + + //--------------------------- PopupMenu ----------------------- + String MENU_ITEM_TYPE = "MenuItemType"; + String MENU_ITEM_TYPE_LOCK = "lock"; + + String BUTTON_GROUP_POSITION = "group_position"; + + //--------------------------- Panel ---------------------------- + String PANEL_TYPE = "panelType"; + String ROUNDED_PANEL = "roundedPanel"; + + //--------------------------- ComboBox ---------------------------- + String COMBO_BOX_TYPE = "comboBoxType"; + String ADAPTIVE_COMBO_BOX = "adaptiveComboBox"; + + int GROUP_BUTTON_POSITION_INNER = 0; + int GROUP_BUTTON_POSITION_LEFT = 1; + int GROUP_BUTTON_POSITION_RIGHT = 2; + int GROUP_BUTTON_POSITION_LEFT_TOP = 3; + int GROUP_BUTTON_POSITION_LEFT_BOTTOM = 4; + int GROUP_BUTTON_POSITION_RIGHT_TOP = 5; + int GROUP_BUTTON_POSITION_RIGHT_BOTTOM = 6; + +} diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineComponentsFactory.java b/designer-base/src/main/java/com/fine/theme/utils/FineComponentsFactory.java new file mode 100644 index 0000000000..80cc69c932 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/FineComponentsFactory.java @@ -0,0 +1,65 @@ +package com.fine.theme.utils; + +import com.fine.theme.icon.LazyIcon; +import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.stable.Constants; + +import javax.swing.Icon; +import javax.swing.JButton; +import javax.swing.JPanel; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineUIStyle.STYLE_PRIMARY; +import static com.fine.theme.utils.FineUIStyle.setStyle; + +/** + * 设计器典型组件组合工厂 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/07/26 + */ +public class FineComponentsFactory { + + /** + * 创建水平对齐按钮组 + * + * @return 组件 + */ + public static UIButtonGroup createHorizontalAlignmentButtonGroup() { + Icon[][] alignmentIconArray = {{new LazyIcon("h_left"), new LazyIcon("h_left").white()}, + {new LazyIcon("h_center"), new LazyIcon("h_center").white()}, + {new LazyIcon("h_right"), new LazyIcon("h_right").white()}}; + Integer[] alignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; + return new UIButtonGroup<>(alignmentIconArray, alignment); + } + + /** + * 创建垂直对齐按钮组 + * + * @return 组件 + */ + public static UIButtonGroup createVerticalAlignmentButtonGroup() { + Icon[][] alignmentIconArray = {{new LazyIcon("v_top"), new LazyIcon("v_top").white()}, + {new LazyIcon("v_center"), new LazyIcon("v_center").white()}, + {new LazyIcon("v_bottom"), new LazyIcon("v_bottom").white()}}; + Integer[] alignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM}; + return new UIButtonGroup<>(alignmentIconArray, alignment); + } + + /** + * 创建确认&取消按钮组，间距为8，右对齐 + * + * @param confirmButton 确认按钮 + * @param cancelButton 取消按钮 + * @return 确认&取消按钮组面板 + */ + public static JPanel createConfirmCancelButtonPane(JButton confirmButton, JButton cancelButton) { + setStyle(confirmButton, STYLE_PRIMARY); + return row(8, + flex(), cell(confirmButton), cell(cancelButton)).getComponent(); + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineLayoutBuilder.java b/designer-base/src/main/java/com/fine/theme/utils/FineLayoutBuilder.java new file mode 100644 index 0000000000..b9144f31ef --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/FineLayoutBuilder.java @@ -0,0 +1,189 @@ +package com.fine.theme.utils; + +import com.fine.swing.ui.layout.Column; +import com.fine.swing.ui.layout.Layouts; +import com.fine.swing.ui.layout.Row; +import com.fine.swing.ui.layout.Spacer; +import com.fr.design.foldablepane.UIExpandablePane; +import com.fr.design.gui.ilable.UILabel; +import com.fr.log.FineLoggerFactory; +import com.fr.stable.collections.combination.Pair; + +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static com.fine.swing.ui.layout.Layouts.cell; + +/** + * 设计器典型布局构建器 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/05/08 + */ +public class FineLayoutBuilder { + + /** + * 创建标准行列表格布局，行内元素均匀分布 + * + * @param elePerRow 每行元素数 + * @param rowSpacing 行内间距 + * @param colSpacing 列内间距 + * @param componentList 组件 + * @return 表格面板 + */ + public static Column createCommonTableLayout(int elePerRow, int rowSpacing, int colSpacing, List componentList) { + int rowNum = componentList.size() / elePerRow + 1; + Iterator iterator = componentList.iterator(); + + Column column = new Column(); + column.setSpacing(colSpacing); + + Row currentRow; + for (int i = 0; i < rowNum; i++) { + currentRow = new Row(); + currentRow.setSpacing(rowSpacing); + for (int j = 0; j < elePerRow; j++) { + Layouts.populate(currentRow, cell( + iterator.hasNext() ? iterator.next() : new Spacer(1) + ).weight(1)); + } + column.add(currentRow); + } + return column; + } + + /** + * 兼容TableLayout配置项，生成网格布局面板 + * + * @param colSpacing 间距 + * @param components 组件二维数组，内部每个一维数组均为行内组件，一维数组元素需与weight严格对应 + * @param weight 行内权重列表，形如[0.4,0.6] 即首个元素占比0.4，第二个元素占比0.6 + * @return 面板 + */ + public static JPanel compatibleTableLayout(int colSpacing, Component[][] components, double[] weight) { + Column column = new Column(); + column.setSpacing(colSpacing); + try { + for (Component[] componentArray : components) { + Row row = new Row(); + List visibleComponents = Arrays.stream(componentArray) + .filter(com -> com != null && com.isVisible()).collect(Collectors.toList()); + if (visibleComponents.size() >= 1) { + // 仅当存在可见组件时处理布局 + dealWithVisibleComponents(weight, column, componentArray, row, visibleComponents); + } + } + return asBorderLayoutWrapped(column); + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e, "[Designer] create layout failed."); + } + return new JPanel(); + } + + private static void dealWithVisibleComponents(double[] weight, Column column, Component[] value, Row row, List components) { + if (components.size() == 1 && value[0] != null) { + // 仅存在首个元素，则该元素自适应占满整行 + Layouts.populate(row, cell(components.get(0)).weight(1)); + } else { + // 其他场景，按权重分配布局，以适配原TableLayout形式 + for (int j = 0; j < value.length; j++) { + Component component = value[j]; + if (component == null) { + component = new Spacer(1); + } + Layouts.populate(row, cell(component).weight(weight[j])); + } + } + column.add(row); + } + + /** + * 创建竖向排列的扩展面板列表 + * + * @param spacing 间距 + * @param elements 面板元素，含标题、面板 + * @return 竖向排列面板 + */ + @SafeVarargs + public static Column createVerticalExpandPaneLayout(int spacing, Pair... elements) { + UIExpandablePane[] panes = IntStream.range(0, elements.length) + .mapToObj(i -> { + Pair pair = elements[i]; + if (i != elements.length - 1) { + return new UIExpandablePane(pair.getFirst(), pair.getSecond(), true); + } + return new UIExpandablePane(pair.getFirst(), pair.getSecond()); + }) + .toArray(UIExpandablePane[]::new); + return createVerticalLayout(spacing, panes); + } + + /** + * 创建垂直布局面板 + * + * @param spacing 间距 + * @param elements 面板元素 + * @return 面板 + */ + public static Column createVerticalLayout(int spacing, Component... elements) { + Column column = new Column(); + column.setSpacing(spacing); + for (Component element : elements) { + column.add(element); + } + return column; + } + + /** + * 创建水平布局面板 + * + * @param spacing 间距 + * @param elements 面板元素 + * @return 面板 + */ + public static Row createHorizontalLayout(int spacing, double[] weight, Component... elements) { + Row row = new Row(); + row.setSpacing(spacing); + for (int i = 0; i < elements.length; i++) { + Layouts.populate(row, cell(elements[i]).weight(weight[i])); + } + return row; + } + + /** + * 创建水平布局面板 + * + * @param spacing 间距 + * @param elements 面板元素 + * @return 面板 + */ + public static Row createHorizontalLayout(int spacing, Component... elements) { + Row row = new Row(); + row.setSpacing(spacing); + for (Component element : elements) { + Layouts.populate(row, cell(element)); + } + return row; + } + + + /** + * 组件包装于BorderLayout中 + * + * @param component 组件 + * @return 包装后的面板 + */ + public static JPanel asBorderLayoutWrapped(Component component) { + JPanel panel = new JPanel(new BorderLayout()); + panel.add(component); + return panel; + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineUIConstants.java b/designer-base/src/main/java/com/fine/theme/utils/FineUIConstants.java new file mode 100644 index 0000000000..8ab37f7951 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/FineUIConstants.java @@ -0,0 +1,25 @@ +package com.fine.theme.utils; + +import java.awt.Dimension; + +/** + * 主题UI常量 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/08/05 + */ +public class FineUIConstants { + + public static final int SCALE_FONT_SIZE_12 = FineUIScale.scale(12); + + public static final int SCALE_FONT_SIZE_13 = FineUIScale.scale(13); + + /** + * 对话框常量 + */ + public static class Dialog { + public static final Dimension POP_DIALOG_MEDIUM = FineUIScale.scale(new Dimension(360, 400)); + + } +} diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineUIScale.java b/designer-base/src/main/java/com/fine/theme/utils/FineUIScale.java new file mode 100644 index 0000000000..6297166c78 --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/FineUIScale.java @@ -0,0 +1,86 @@ +package com.fine.theme.utils; + +import com.formdev.flatlaf.util.UIScale; + +import javax.swing.plaf.DimensionUIResource; +import javax.swing.plaf.InsetsUIResource; +import javax.swing.plaf.UIResource; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.Insets; + +/** + * UI缩放工具 + * + * @author vito + * @since 11.0 + * Created on 2023/11/15 + */ +public class FineUIScale { + /** + * Multiplies the given value by the user scale factor. + */ + public static float scale(float value) { + return UIScale.scale(value); + } + + /** + * Multiplies the given value by the user scale factor and rounds the result. + */ + public static int scale(int value) { + return UIScale.scale(value); + } + + /** + * Similar as {@link #scale(int)} but always "rounds down". + *

+ * For use in special cases. {@link #scale(int)} is the preferred method. + */ + public static int scale2(int value) { + return UIScale.scale2(value); + } + + /** + * Divides the given value by the user scale factor. + */ + public static float unscale(float value) { + return UIScale.unscale(value); + } + + /** + * Divides the given value by the user scale factor and rounds the result. + */ + public static int unscale(int value) { + return UIScale.unscale(value); + } + + /** + * If user scale factor is not 1, scale the given graphics context by invoking + * {@link Graphics2D#scale(double, double)} with user scale factor. + */ + public static void scaleGraphics(Graphics2D g) { + UIScale.scaleGraphics(g); + } + + /** + * Scales the given dimension with the user scale factor. + *

+ * If user scale factor is 1, then the given dimension is simply returned. + * Otherwise, a new instance of {@link Dimension} or {@link DimensionUIResource} + * is returned, depending on whether the passed dimension implements {@link UIResource}. + */ + public static Dimension scale(Dimension dimension) { + return UIScale.scale(dimension); + } + + /** + * Scales the given insets with the user scale factor. + *

+ * If user scale factor is 1, then the given insets is simply returned. + * Otherwise, a new instance of {@link Insets} or {@link InsetsUIResource} + * is returned, depending on whether the passed dimension implements {@link UIResource}. + */ + public static Insets scale(Insets insets) { + return UIScale.scale(insets); + } +} diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java b/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java new file mode 100644 index 0000000000..925c0a438d --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java @@ -0,0 +1,121 @@ +package com.fine.theme.utils; + +import com.finebi.cbb.utils.StringUtils; + +import javax.swing.JComponent; + +/** + * UI样式工具 + * + * @author vito + * @since 11.0 + * Created on 2024/1/4 + */ +public interface FineUIStyle { + + String IN_TOOLBAR_GROUP = "inToolbarGroup"; + String STYLE_PRIMARY = "primary"; + String STYLE_SECONDARY = "secondary"; + String STYLE_TEXT = "text"; + String STYLE_SIZE_MEDIUM = "mediumSize"; + String STYLE_SIZE_SMALL = "smallSize"; + String MENU_BAR = "menuBar"; + String LIGHT_GREY = "lightGrey"; + String IN_TOOLBAR_LEFT = "inToolbarLeft"; + String IN_TOOLBAR_RIGHT = "inToolbarRight"; + String NORMAL_COLOR = "normalColor"; + String TOP_TOOLS = "topTools"; + String BRAND_COLOR_LABEL = "brandColorLabel"; + String BUTTON_TAB_ACTION = "tabAction"; + String LABEL_BOLD = "boldLabel"; + String LABEL_SECONDARY = "secondaryLabel"; + String LABEL_TIP = "tipLabel"; + String LABEL_WARNING_TIP = "warningTipLabel"; + String LABEL_UILIST = "uiListLabel"; + String PLAIN_BUTTON = "plainButton"; + String TOGGLE_GROUP = "inToggleGroup"; + String COMPACT_BUTTON = "compactButton"; + String MENU_TOOL_BAR = "menuToolBar"; + String MENU_ITEM_TOOL_BAR = "menuItemToolBar"; + String POPUP_MENU_TOOL_BAR = "popupMenuToolBar"; + String POPUP_MENU_DROPDOWN = "dropdownPopupMenu"; + String TRANSPARENT_TEXT_FIELD = "transparentTextField"; + String TRANSPARENT_BACKGROUND = "transparentBackground"; + String PURE_LIST = "pureList"; + String NO_BORDER_LIST = "noBorderList"; + String PURE_TREE = "pureTree"; + String PASTEL_BUTTON = "pastelButton"; + String BREADCRUMB_BUTTON = "breadcrumbButton"; + + String DEFAULT_TABLE = "defaultTable"; + String WHITE_BUTTON = "whiteButton"; + String ORIGINAL_BUTTON = "originalButton"; + String DETAIL_LABEL = "detailLabel"; + + + /** + * 添加组件的样式类，类似css，该方法会接在原样式后方 + * + * FineClientProperties.appendStyle("primary small") + * + * + * @param it 组件 + * @param styleClass 样式字符串，支持连续添加类，用空格 + */ + static void appendStyle(JComponent it, String styleClass) { + Object oriProperty = it.getClientProperty(FineClientProperties.STYLE_CLASS); + if (oriProperty instanceof String && StringUtils.isNotBlank((String) oriProperty)) { + styleClass = oriProperty + " " + styleClass; + } + it.putClientProperty(FineClientProperties.STYLE_CLASS, styleClass); + } + + /** + * 设置组件的样式类，类似css，该方法会替换原样式 + * + * FineClientProperties.setStyle("primary small") + * + * + * @param jComponent 组件 + * @param styleClass 样式字符串，支持连续添加类，用空格 + */ + static void setStyle(JComponent jComponent, String styleClass) { + jComponent.putClientProperty(FineClientProperties.STYLE_CLASS, styleClass); + } + + /** + * 样式组合 + * + * @param styleClasses 所有样式 + * @return 样式列表 + */ + static String joinStyle(String... styleClasses) { + final StringBuilder sb = new StringBuilder(); + for (final String style : styleClasses) { + if (style == null) { + continue; + } + if (sb.length() > 0) { + sb.append(" "); + } + sb.append(style); + } + return sb.toString(); + } + + /** + * 包含样式 + * + * @param jComponent 组件 + * @param styleClass 样式 + * @return 是否包含指定的样式 + */ + static boolean hasStyle(JComponent jComponent, String styleClass) { + Object style = jComponent.getClientProperty(FineClientProperties.STYLE_CLASS); + if (style instanceof String && StringUtils.isNotBlank((String) style)) { + return ((String) style).contains(styleClass); + } + return false; + } + +} diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineUIUtils.java b/designer-base/src/main/java/com/fine/theme/utils/FineUIUtils.java new file mode 100644 index 0000000000..bf48c66c6d --- /dev/null +++ b/designer-base/src/main/java/com/fine/theme/utils/FineUIUtils.java @@ -0,0 +1,438 @@ +package com.fine.theme.utils; + +import com.fine.theme.light.ui.CollapsibleScrollBarLayerUI; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.fr.design.border.FineBorderFactory; +import com.fr.design.constants.LayoutConstants; +import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.ilable.UILabel; +import com.fr.stable.os.OperatingSystem; +import com.fr.value.AtomicClearableLazyValue; + +import javax.swing.JLabel; +import javax.swing.JLayer; +import javax.swing.ScrollPaneConstants; +import javax.swing.UIManager; +import java.awt.Color; +import java.awt.Component; +import java.awt.Composite; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.awt.Insets; +import java.awt.geom.Path2D; +import java.awt.geom.RoundRectangle2D; +import java.lang.reflect.Field; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.theme.light.ui.FineButtonUI.isLeftRoundButton; +import static com.formdev.flatlaf.util.UIScale.scale; + +/** + * UI绘制的一些常用方法 + * + * @author vito + * @since 11.0 + * Created on 2023/11/3 + */ +public class FineUIUtils { + + public static final int RETINA_SCALE_FACTOR = 2; + + /** + * 判断是否支持retina，制作一些特殊效果，如HIDPI图片绘制。 + * retina 是一种特殊的效果，使用4个像素点模拟一个像素点， + * 因此在其他操作系统上，即使是高分屏也不具备retina的效果。 + * 甚至还有劣化的效果以及更差的性能。 + * + * @since 2023.11.16 + */ + private static final AtomicClearableLazyValue RETINA = AtomicClearableLazyValue.create(() -> { + // 经过测试win11，ubuntu等，没有retina效果 + if (!OperatingSystem.isMacos()) { + return false; + } + GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); + GraphicsDevice device = env.getDefaultScreenDevice(); + + try { + Field field = device.getClass().getDeclaredField("scale"); + field.setAccessible(true); + Object scale = field.get(device); + if (scale instanceof Integer && (Integer) scale == RETINA_SCALE_FACTOR) { + return true; + } + } catch (Exception ignored) { + } + return false; + }); + + /** + * 是否支持 retina + * + * @return 是否支持 retina + */ + public static boolean getRetina() { + return RETINA.getValue(); + } + + /** + * 放弃 retina 判断结果，用于清理或者切换环境 + */ + public static void clearRetina() { + RETINA.drop(); + } + + /** + * 通过key获取UI的颜色，如果没有则使用后备key获取 + * + * @param key 颜色key + * @param defaultKey 颜色后备key + * @return 颜色 + */ + public static Color getUIColor(String key, String defaultKey) { + Color color = UIManager.getColor(key); + return (color != null) ? color : UIManager.getColor(defaultKey); + } + + /** + * 获取key指定的int值，如果没有则使用后备key获取 + * + * @param key int所在的key + * @param defaultKey 后备key + * @return 长度 + */ + public static int getUIInt(String key, String defaultKey) { + Object value = UIManager.get(key); + return (value instanceof Integer) ? (Integer) value : UIManager.getInt(defaultKey); + } + + /** + * 获取key指定的int值，并根据dpi进行缩放 + * + * @param key int所在的key + * @param defaultKey 后备key + * @return 长度 + */ + public static int getAndScaleInt(String key, String defaultKey) { + int intNum = getUIInt(key, defaultKey); + return FineUIScale.scale(intNum); + } + + /** + * 获取key指定的int值，并根据dpi进行缩放 + * + * @param key int所在的key + * @param defaultInt 默认值 + * @return 长度 + */ + public static int getAndScaleInt(String key, int defaultInt) { + int intNum = FlatUIUtils.getUIInt(key, defaultInt); + return FineUIScale.scale(intNum); + } + + /** + * 通过key获取UI的边距，如果没有则使用后备key获取 + * + * @param key 边距key + * @param defaultKey 边距后备key + * @return 边距 + */ + public static Insets getUIInsets(String key, String defaultKey) { + Insets margin = UIManager.getInsets(key); + return (margin != null) ? margin : UIManager.getInsets(defaultKey); + } + + /** + * 通过key获取UI的边距，如果没有则使用后备边距 + * + * @param key 边距key + * @param defaultInsets 后备边距 + * @return 边距 + */ + public static Insets getUIInsets(String key, Insets defaultInsets) { + Insets margin = UIManager.getInsets(key); + return (margin != null) ? margin : defaultInsets; + } + + /** + * 通过key获取UI的边距，如果没有则使用后备边距，并根据dpi进行缩放 + * + * @param key 边距key + * @param defaultInsets 后备边距 + * @return 根据dpi缩放后的边距 + */ + public static Insets getAndScaleUIInsets(String key, Insets defaultInsets) { + Insets margin = UIManager.getInsets(key); + Insets insets = (margin != null) ? margin : defaultInsets; + return FineUIScale.scale(insets); + } + + /** + * 绘制混合图像，含圆角、背景色设置 + * + * @param g 图像 + * @param composite 混合图像 + * @param background 背景色 + * @param width 宽度 + * @param height 高度 + * @param radius 圆角 + */ + public static void paintWithComposite(Graphics g, Composite composite, Color background, + int width, int height, int radius) { + Graphics2D g2d = (Graphics2D) g; + + FlatUIUtils.setRenderingHints(g2d); + Composite oldComposite = g2d.getComposite(); + g2d.setComposite(composite); + + g2d.setColor(background); + g2d.fill(new RoundRectangle2D.Float(0, 0, width, height, radius, radius)); + g2d.setComposite(oldComposite); + } + + + /** + * 绘制部分圆角矩形边框 + * + * @param g2 Graphics2D + * @param x x坐标 + * @param y y坐标 + * @param width 宽度 + * @param height 高度 + * @param borderWidth 边框宽度 + * @param arc 圆角 + */ + public static void paintPartRoundButtonBorder(Component c, Graphics2D g2, int x, int y, int width, int height, + float borderWidth, float arc) { + FlatUIUtils.setRenderingHints(g2); + arc = scale(arc); + float t = scale(borderWidth); + float t2x = t * 2; + Path2D path2D = new Path2D.Float(Path2D.WIND_EVEN_ODD); + if (isLeftRoundButton(c)) { + path2D.append(createLeftRoundRectangle(x, y, width, height, arc), false); + path2D.append(createLeftRoundRectangle(x + t, y + t, width - t, height - t2x, arc - t), false); + } else { + path2D.append(createRightRoundRectangle(x, y, width, height, arc), false); + path2D.append(createRightRoundRectangle(x, y + t, width - t, height - t2x, arc - t), false); + } + g2.fill(path2D); + } + + /** + * 绘制圆角tab边框 + * + * @param g2 Graphics2D + * @param x x坐标 + * @param y y坐标 + * @param width 宽度 + * @param height 高度 + * @param borderWidth 边框宽度 + * @param arc 圆角 + */ + public static void paintRoundTabBorder(Graphics2D g2, double x, double y, double width, double height, + float borderWidth, float arc) { + FlatUIUtils.setRenderingHints(g2); + arc = scale(arc); + float t = scale(borderWidth); + float t2x = t * 2; + Path2D path2D = new Path2D.Float(Path2D.WIND_EVEN_ODD); + path2D.append(createTopRoundRectangle(x, y, width, height, arc), false); + path2D.append(createTopRoundRectangle(x + t, y + t, width - t2x, height - t, arc - t), false); + g2.fill(path2D); + } + + /** + * 创建一个部分圆角的矩形路径 + * + * @param x x坐标 + * @param y y坐标 + * @param width 矩形宽度 + * @param height 矩形高度 + * @param arcTopLeft 左上圆角弧度 + * @param arcTopRight 右上圆角弧度 + * @param arcBottomRight 右下圆角弧度 + * @param arcBottomLeft 左下圆角弧度 + * @return 路径 + */ + public static Path2D createPartRoundRectangle(double x, double y, double width, double height, + double arcTopLeft, double arcTopRight, double arcBottomRight, double arcBottomLeft) { + Path2D path = new Path2D.Double(Path2D.WIND_EVEN_ODD, 7); + path.moveTo(x + arcTopLeft, y); + path.lineTo(x + width - arcTopRight, y); + path.quadTo(x + width, y, x + width, y + arcTopRight); + path.lineTo(x + width, y + height - arcBottomRight); + path.quadTo(x + width, y + height, x + width - arcBottomRight, y + height); + path.lineTo(x + arcBottomLeft, y + height); + path.quadTo(x, y + height, x, y + height - arcBottomLeft); + path.lineTo(x, y + arcTopLeft); + path.quadTo(x, y, x + arcTopLeft, y); + path.closePath(); + return path; + } + + + /** + * 创建一个左圆角矩形路径 + * + * @param x x坐标 + * @param y y坐标 + * @param width 矩形宽度 + * @param height 矩形高度 + * @param arc 圆角弧度 + * @return 路径 + */ + public static Path2D createLeftRoundRectangle(float x, float y, float width, float height, float arc) { + return createPartRoundRectangle(x, y, width, height, arc, 0, 0, arc); + } + + + /** + * 创建一个右圆角矩形路径 + * + * @param x x坐标 + * @param y y坐标 + * @param width 矩形宽度 + * @param height 矩形高度 + * @param arc 圆角弧度 + * @return 路径 + */ + public static Path2D createRightRoundRectangle(float x, float y, float width, float height, float arc) { + return createPartRoundRectangle(x, y, width, height, 0, arc, arc, 0); + } + + /** + * 创建一个顶圆角矩形路径 + * + * @param x x坐标 + * @param y y坐标 + * @param width 矩形宽度 + * @param height 矩形高度 + * @param arc 圆角弧度 + * @return 路径 + */ + public static Path2D createTopRoundRectangle(double x, double y, double width, double height, double arc) { + return createPartRoundRectangle(x, y, width, height, arc, arc, 0, 0); + } + + /** + * 创建一个左上圆角的矩形路径 + * + * @param x x坐标 + * @param y y坐标 + * @param width 矩形宽度 + * @param height 矩形高度 + * @param arc 圆角弧度 + * @return 路径 + */ + public static Path2D createTopLeftRoundRectangle(float x, float y, float width, float height, float arc) { + return createPartRoundRectangle(x, y, width, height, arc, 0, 0, 0); + } + + /** + * 创建一个左下圆角的矩形路径 + * + * @param x x坐标 + * @param y y坐标 + * @param width 矩形宽度 + * @param height 矩形高度 + * @param arc 圆角弧度 + * @return 路径 + */ + public static Path2D createBottomLeftRoundRectangle(float x, float y, float width, float height, float arc) { + return createPartRoundRectangle(x, y, width, height, 0, 0, 0, arc); + } + + /** + * 创建一个右上圆角的矩形路径 + * + * @param x x坐标 + * @param y y坐标 + * @param width 矩形宽度 + * @param height 矩形高度 + * @param arc 圆角弧度 + * @return 路径 + */ + public static Path2D createTopRightRoundRectangle(float x, float y, float width, float height, float arc) { + return createPartRoundRectangle(x, y, width, height, 0, arc, 0, 0); + } + + /** + * 创建一个右下圆角的矩形路径 + * + * @param x x坐标 + * @param y y坐标 + * @param width 矩形宽度 + * @param height 矩形高度 + * @param arc 圆角弧度 + * @return 路径 + */ + public static Path2D createBottomRightRoundRectangle(float x, float y, float width, float height, float arc) { + return createPartRoundRectangle(x, y, width, height, 0, 0, arc, 0); + } + + /** + * 标签加粗显示，并设置下划线；适用于小标题 + * + * @param label 标签 + */ + public static void wrapBoldLabelWithUnderline(JLabel label) { + label.setBorder(FineBorderFactory.createDefaultUnderlineBorder()); + FineUIStyle.setStyle(label, FineUIStyle.LABEL_BOLD); + } + + /** + * 面板元素头部添加小标题 + * + * @param component 面板元素 + * @param title 标题文本 + * @return 包装面板 + */ + public static Component wrapComponentWithTitle(Component component, String title) { + UILabel label = new UILabel(title); + wrapBoldLabelWithUnderline(label); + return column(LayoutConstants.VERTICAL_GAP, + cell(label), cell(component).weight(1.0) + ).getComponent(); + } + + /** + * 基于组件创建一个UIScrollPane的装饰层，内部的ScrollPane仅当悬浮时显示滚动条 + * + * @param c 组件 + * @return UIScrollPane的装饰层 + */ + public static JLayer createCollapsibleScrollBarLayer(Component c) { + return new JLayer<>(new UIScrollPane(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER), + new CollapsibleScrollBarLayerUI()); + } + + /** + * 基于组件创建一个UIScrollPane的装饰层，内部的ScrollPane仅当悬浮时显示滚动条 + * + * @param c 组件 + * @param verticalPolicy 滚动条垂直显示策略 + * @param horizontalPolicy 滚动条水平显示策略 + * @return UIScrollPane的装饰层 + */ + public static JLayer createCollapsibleScrollBarLayer(Component c, int verticalPolicy, int horizontalPolicy) { + return new JLayer<>(new UIScrollPane(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER), + new CollapsibleScrollBarLayerUI(verticalPolicy, horizontalPolicy)); + } + + /** + * 设置组件字体大小，已适配字体缩放 + * + * @param c 组件 + * @param size 字体大小 + */ + public static void setFontSize(Component c, int size) { + Font font = c.getFont(); + Font newSizeFont = font.deriveFont(font.getStyle(), scale(size)); + c.setFont(newSizeFont); + } +} diff --git a/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java b/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java index 546a702979..7d5deaa066 100644 --- a/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java @@ -1,14 +1,18 @@ package com.fr.design.actions; +import com.fine.theme.icon.LazyIcon; import com.fr.base.vcs.DesignerMode; import com.fr.design.constants.UIConstants; +import com.fr.design.designer.TargetComponent; +import com.fr.design.file.HistoryTemplateListPane; +import com.fr.design.mainframe.DesignerContext; +import com.fr.design.mainframe.EastRegionContainerPane; +import com.fr.design.mainframe.JTemplate; +import com.fr.design.mainframe.WestRegionContainerPane; import com.fr.design.menu.KeySetUtils; import com.fr.design.module.DesignModuleFactory; import com.fr.design.roleAuthority.ReportAndFSManagePane; import com.fr.design.roleAuthority.RolesAlreadyEditedPane; -import com.fr.design.designer.TargetComponent; -import com.fr.design.file.HistoryTemplateListPane; -import com.fr.design.mainframe.*; /** * Author : daisy @@ -22,7 +26,7 @@ public class AllowAuthorityEditAction extends TemplateComponentAction { this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_report/allow_authority_edit"); + this.setSmallIcon(new LazyIcon("allowAuthorityEdit")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java index 8a6e7a7df9..dbc72adbd7 100644 --- a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java @@ -1,18 +1,18 @@ package com.fr.design.actions; -import javax.swing.SwingUtilities; -import com.fr.base.svg.IconUtils; -import com.fr.design.data.DesignTableDataManager; +import com.fine.theme.icon.LazyIcon; import com.fr.data.TableDataSource; +import com.fr.design.DesignModelAdapter; +import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.ReportTableDataPane; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.data.tabledata.ResponseDataSourceChange; -import com.fr.design.DesignModelAdapter; -import com.fr.design.mainframe.JTemplate; -import com.fr.design.menu.KeySetUtils; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.mainframe.JTemplate; +import com.fr.design.menu.KeySetUtils; +import javax.swing.SwingUtilities; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -26,7 +26,7 @@ public class TableDataSourceAction extends TemplateComponentAction valueIt = this.componentMap.values().iterator(); - while (valueIt.hasNext()) { - Object valueObject = valueIt.next(); - if (valueObject instanceof JComponent) { - ((JComponent) valueObject).setEnabled(this.enabled); + if (this.componentMap != null) { + Iterator valueIt = this.componentMap.values().iterator(); + while (valueIt.hasNext()) { + Object valueObject = valueIt.next(); + if (valueObject instanceof JComponent) { + ((JComponent) valueObject).setEnabled(this.enabled); + } } } } @@ -171,6 +164,11 @@ public abstract class UpdateAction extends ShortCut implements Action { * @param smallIcon The small icon for the action. */ public void setSmallIcon(Icon smallIcon) { + if(smallIcon instanceof LazyIcon){ + this.putValue(Action.SMALL_ICON, smallIcon); + this.putValue(UpdateAction.DISABLED_ICON,((LazyIcon) smallIcon).disabled()); + return; + } this.putValue(Action.SMALL_ICON, smallIcon); } @@ -677,7 +675,7 @@ public abstract class UpdateAction extends ShortCut implements Action { protected void setDisabledIcon4Button(AbstractButton button) { Icon disabledIcon = (Icon) this.getValue(UpdateAction.DISABLED_ICON); - if (disabledIcon != null && disabledIcon instanceof SVGIcon) { + if (disabledIcon != null) { button.setDisabledIcon(disabledIcon); } } diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java index ed487578c8..2ffbd732c5 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.login.AbstractDesignerSSO; import com.fr.design.menu.MenuKeySet; @@ -22,7 +23,7 @@ public class BBSAction extends AbstractDesignerSSO { this.setMenuKeySet(BBS); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/bbs"); + this.setSmallIcon(new LazyIcon("bbs")); } diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java index 9da1539a5a..d5ff0216ec 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.login.AbstractDesignerSSO; import com.fr.design.menu.MenuKeySet; @@ -22,7 +23,7 @@ public class BugAction extends AbstractDesignerSSO { this.setMenuKeySet(BUG); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/bug"); + this.setSmallIcon(new LazyIcon("bug")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BugNeedAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BugNeedAction.java index 74646ef922..6900cb009c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BugNeedAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BugNeedAction.java @@ -1,6 +1,6 @@ package com.fr.design.actions.community; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.locale.impl.BugNeedMark; import com.fr.design.menu.MenuKeySet; @@ -8,7 +8,7 @@ import com.fr.design.utils.BrowseUtils; import com.fr.general.locale.LocaleCenter; import com.fr.general.locale.LocaleMark; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; /** @@ -20,7 +20,7 @@ public class BugNeedAction extends UpdateAction { this.setMenuKeySet(BugAndNeed); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/need"); + this.setSmallIcon(new LazyIcon("need")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java b/designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java index 093070b55c..ed5e0545a7 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.menu.MenuKeySet; @@ -24,7 +25,7 @@ public class CenterAction extends UpAction { this.setMenuKeySet(CENTER); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/center"); + this.setSmallIcon(new LazyIcon("actCenter")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java index 33279060b6..47a9546396 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.login.AbstractDesignerSSO; import com.fr.design.menu.MenuKeySet; @@ -22,7 +23,7 @@ public class NeedAction extends AbstractDesignerSSO { this.setMenuKeySet(NEED); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/need"); + this.setSmallIcon(new LazyIcon("need")); } diff --git a/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java b/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java index e56359139a..807a82382e 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.login.AbstractDesignerSSO; import com.fr.design.menu.MenuKeySet; @@ -22,7 +23,7 @@ public class QuestionAction extends AbstractDesignerSSO { this.setMenuKeySet(QUESTIONS); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/question"); + this.setSmallIcon(new LazyIcon("question")); } diff --git a/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java b/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java index 29817e36a6..27740ae5c6 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.login.AbstractDesignerSSO; import com.fr.design.menu.MenuKeySet; @@ -22,7 +23,7 @@ public class SignAction extends AbstractDesignerSSO { this.setMenuKeySet(SIGN); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/sign"); + this.setSmallIcon(new LazyIcon("sign")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java b/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java index 0d2e79905d..19823ee6b4 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.i18n.Toolkit; import com.fr.design.login.AbstractDesignerSSO; @@ -18,7 +19,7 @@ public class StudyPlanAction extends AbstractDesignerSSO { public StudyPlanAction() { this.setName(Toolkit.i18nText("Fine-Design_Study_Plan")); - this.setSmallIcon("/com/fr/design/images/bbs/studyPlan"); + this.setSmallIcon(new LazyIcon("studyPlan")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java b/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java index f0e4f3ac30..9ae549e7c4 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.login.AbstractDesignerSSO; import com.fr.design.menu.MenuKeySet; @@ -25,7 +26,7 @@ public class TechSolutionAction extends AbstractDesignerSSO { this.setMenuKeySet(TSO); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/solution"); + this.setSmallIcon(new LazyIcon("solution")); } diff --git a/designer-base/src/main/java/com/fr/design/actions/community/TemplateStoreAction.java b/designer-base/src/main/java/com/fr/design/actions/community/TemplateStoreAction.java index 3c17df9b56..87fa878f11 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/TemplateStoreAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/TemplateStoreAction.java @@ -1,6 +1,6 @@ package com.fr.design.actions.community; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.login.AbstractDesignerSSO; import com.fr.design.mainframe.share.collect.ComponentCollector; @@ -28,7 +28,7 @@ public class TemplateStoreAction extends AbstractDesignerSSO { this.setMenuKeySet(TEMPLATE); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/share/template_store.png")); + this.setSmallIcon(new LazyIcon("templateStore")); } public static final MenuKeySet TEMPLATE = new MenuKeySet() { diff --git a/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java b/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java index 6098846352..c85affc742 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java @@ -1,12 +1,13 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.locale.impl.VideoMark; import com.fr.design.login.AbstractDesignerSSO; import com.fr.design.menu.MenuKeySet; import com.fr.general.locale.LocaleCenter; import com.fr.general.locale.LocaleMark; -import javax.swing.*; +import javax.swing.KeyStroke; public class VideoAction extends AbstractDesignerSSO { @@ -14,7 +15,7 @@ public class VideoAction extends AbstractDesignerSSO { this.setMenuKeySet(VIDEO); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/video"); + this.setSmallIcon(new LazyIcon("video")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/WorkOrderCenterAction.java b/designer-base/src/main/java/com/fr/design/actions/community/WorkOrderCenterAction.java index 03e634a4ad..e90ee02133 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/WorkOrderCenterAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/WorkOrderCenterAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.community; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.i18n.Toolkit; @@ -21,7 +22,7 @@ public class WorkOrderCenterAction extends UpAction { private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Work_Order_Center_Default"; public WorkOrderCenterAction() { - this.setSmallIcon("/com/fr/design/images/bbs/workOrderCenter"); + this.setSmallIcon(new LazyIcon("workOrderCenter")); this.setName(Toolkit.i18nText("Fine-Design_Basic_Commuinity_Work_Order_Center")); } diff --git a/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java b/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java index 3a8137f9d0..84fcd68696 100644 --- a/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java +++ b/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java @@ -30,8 +30,8 @@ import java.util.concurrent.CopyOnWriteArraySet; * @version 2017年11月17日14点39分 */ public class ActionFactory { - private static Set> actionClasses = new CopyOnWriteArraySet<>(); - private static Set> floatActionClasses = new CopyOnWriteArraySet<>(); + private static final Set> actionClasses = new CopyOnWriteArraySet<>(); + private static final Set> floatActionClasses = new CopyOnWriteArraySet<>(); private static Class chartCollectionClass = null; /** @@ -287,13 +287,13 @@ public class ActionFactory { * * @param cls 类型数组 */ - public static void registerCellInsertActionClass(Class[] cls) { + public static void registerCellInsertActionClass(Class[] cls) { if (cls != null) { actionClasses.addAll(Arrays.asList(cls)); } } - public static void referCellInsertActionClass(Class[] cls) { + public static void referCellInsertActionClass(Class[] cls) { if (cls != null) { actionClasses.clear(); actionClasses.addAll(Arrays.asList(cls)); @@ -331,13 +331,13 @@ public class ActionFactory { public static MenuKeySet[] createCellInsertActionName() { List actionNames = new ArrayList<>(); JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); - for (Class clazz : actionClasses) { + for (Class clazz : actionClasses) { if (clazz == null) { continue; } if (jTemplate.acceptToolbarItem(clazz)) { try { - Constructor c = (Constructor) clazz.getConstructor(); + Constructor c = clazz.getConstructor(); actionNames.add(c.newInstance().getMenuKeySet()); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); @@ -352,13 +352,13 @@ public class ActionFactory { * * @param cls 插入类型数组 */ - public static void registerFloatInsertActionClass(Class[] cls) { + public static void registerFloatInsertActionClass(Class[] cls) { if (cls != null) { floatActionClasses.addAll(Arrays.asList(cls)); } } - public static void referFloatInsertActionClass(Class[] cls) { + public static void referFloatInsertActionClass(Class[] cls) { if (cls != null) { floatActionClasses.clear(); floatActionClasses.addAll(Arrays.asList(cls)); @@ -374,18 +374,18 @@ public class ActionFactory { */ public static UpdateAction[] createFloatInsertAction(Class cls, Object obj) { List actions = new ArrayList<>(); - for (Class clazz : floatActionClasses) { + for (Class clazz : floatActionClasses) { if (clazz == null) { continue; } try { - Constructor c = (Constructor) clazz.getConstructor(cls); + Constructor c = clazz.getConstructor(cls); actions.add(c.newInstance(obj)); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } } - return actions.toArray(new UpdateAction[actions.size()]); + return actions.toArray(new UpdateAction[0]); } private static QuickEditor createEditor(Class clazz, Map editorMap, Map> editorClassMap) { diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java index 0505a8e140..9f1eda60a9 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java @@ -3,6 +3,7 @@ */ package com.fr.design.actions.edit; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.TemplateComponentAction; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.designer.TargetComponent; @@ -21,7 +22,7 @@ public class CopyAction extends TemplateComponentAction { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy")); this.setMnemonic('C'); - this.setSmallIcon("/com/fr/design/standard/copy/copy"); + this.setSmallIcon(new LazyIcon("copy")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER)); this.setEnabled(!DesignModeContext.isBanCopyAndCut()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java index c15e962272..001c40d770 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java @@ -3,10 +3,10 @@ */ package com.fr.design.actions.edit; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.TemplateComponentAction; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.designer.TargetComponent; -import com.fr.general.IOUtils; import javax.swing.KeyStroke; import java.awt.event.KeyEvent; @@ -25,7 +25,7 @@ public class CutAction extends TemplateComponentAction { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut")); this.setMnemonic('T'); - this.setSmallIcon("/com/fr/design/standard/cut/cut"); + this.setSmallIcon(new LazyIcon("cut")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER)); this.setEnabled(!DesignModeContext.isBanCopyAndCut()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java index c14fcabf57..7319400faf 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java @@ -3,6 +3,7 @@ */ package com.fr.design.actions.edit; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.TemplateComponentAction; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.designer.TargetComponent; @@ -24,7 +25,7 @@ public class PasteAction extends TemplateComponentAction { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste")); this.setMnemonic('P'); - this.setSmallIcon("/com/fr/design/standard/paste/paste"); + this.setSmallIcon(new LazyIcon("paste")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER)); } diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java index b00aff1a61..54fbea3f08 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java @@ -3,14 +3,15 @@ */ package com.fr.design.actions.edit; -import java.awt.event.ActionEvent; - +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.TemplateComponentActionInterface; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; +import java.awt.event.ActionEvent; + /** * Redo. */ @@ -22,7 +23,7 @@ public class RedoAction extends UpdateAction implements TemplateComponentActionI this.setMenuKeySet(KeySetUtils.REDO); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("com/fr/design/images/m_edit/redo"); + this.setSmallIcon(new LazyIcon("monochrome_redo")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java index d8ed5b9da1..af980571d8 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java @@ -3,14 +3,15 @@ */ package com.fr.design.actions.edit; -import java.awt.event.ActionEvent; - +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.TemplateComponentActionInterface; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; +import java.awt.event.ActionEvent; + /** * Undo. */ @@ -22,7 +23,7 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI this.setMenuKeySet(KeySetUtils.UNDO); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_edit/undo"); + this.setSmallIcon(new LazyIcon("monochrome_undo")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/CloseCurrentTemplateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/CloseCurrentTemplateAction.java index 22263a871e..041852857b 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/CloseCurrentTemplateAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/CloseCurrentTemplateAction.java @@ -7,6 +7,7 @@ import com.fr.design.file.MultiTemplateTabPane; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; +import com.fr.general.IOUtils; import java.awt.event.ActionEvent; /** @@ -21,6 +22,7 @@ public class CloseCurrentTemplateAction extends UpdateAction { this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setAccelerator(getMenuKeySet().getKeyStroke()); + this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/blank.gif")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/file/DelFileAction.java b/designer-base/src/main/java/com/fr/design/actions/file/DelFileAction.java index f7851d7af6..b1c66a75bb 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/DelFileAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/DelFileAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.file; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.file.FileOperations; @@ -22,7 +23,7 @@ public class DelFileAction extends UpdateAction { public DelFileAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Remove")); - this.setSmallIcon("/com/fr/design/standard/remove/remove"); + this.setSmallIcon(new LazyIcon("remove")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java b/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java index d007e315fe..0d920a5230 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java @@ -5,6 +5,7 @@ import com.fr.design.actions.UpdateAction; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.mainframe.JTemplate; +import com.fr.general.IOUtils; import java.awt.event.ActionEvent; @@ -13,6 +14,7 @@ public class EditEnvAction extends UpdateAction { public EditEnvAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Others") + "..."); + this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/blank.gif")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/file/ExitDesignerAction.java b/designer-base/src/main/java/com/fr/design/actions/file/ExitDesignerAction.java index 5925e250f4..0e395da9fe 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/ExitDesignerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/ExitDesignerAction.java @@ -5,6 +5,7 @@ package com.fr.design.actions.file; import com.fr.design.file.SaveSomeTemplatePane; import com.fr.design.mainframe.TemplateSavingChecker; +import com.fr.general.IOUtils; import java.awt.event.ActionEvent; import com.fr.design.actions.UpdateAction; @@ -22,6 +23,7 @@ public class ExitDesignerAction extends UpdateAction { this.setMenuKeySet(KeySetUtils.EXIT_DESIGNER); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/blank.gif")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java index 0c039b4af7..44275bedf3 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.file; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.TemplateTreePane; @@ -28,7 +29,7 @@ public class LocateAction extends UpdateAction { public LocateAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Locate")); - this.setSmallIcon("/com/fr/design/standard/locate/locate"); + this.setSmallIcon(new LazyIcon("locate")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java b/designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java index 7533cb133a..799594c4e1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java @@ -1,10 +1,10 @@ package com.fr.design.actions.file; +import com.fine.theme.icon.LazyIcon; import java.awt.event.ActionEvent; import java.io.File; import java.util.List; -import com.fr.base.BaseUtils; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.imenu.UIMenu; @@ -62,7 +62,7 @@ public class OpenRecentReportMenuDef extends MenuDef { public OpenRecentReportAction(String cptName) { this.setName(cptName); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/oem/logo.png")); + this.setSmallIcon(new LazyIcon("logo")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java index 699119fe50..491b150dd6 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java @@ -3,15 +3,15 @@ */ package com.fr.design.actions.file; -import java.awt.event.ActionEvent; - -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.KeySetUtils; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; +import java.awt.event.ActionEvent; + /** * Open Template. @@ -22,7 +22,7 @@ public class OpenTemplateAction extends UpdateAction { this.setMenuKeySet(KeySetUtils.OPEN_TEMPLATE); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/buttonicon/open"); + this.setSmallIcon(new LazyIcon("openTemplate")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java index dd48e26841..d571d60f34 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java @@ -11,6 +11,7 @@ import com.fr.design.mainframe.DesignerFrameFileDealerPane; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; +import com.fr.general.IOUtils; import java.awt.event.ActionEvent; @@ -20,6 +21,7 @@ public class PreferenceAction extends UpdateAction { this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); this.generateAndSetSearchText(PreferencePane.class.getName()); + this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/blank.gif")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index d6bd7927c6..7c22614cd1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -1,5 +1,10 @@ package com.fr.design.actions.file; +import com.fine.swing.ui.layout.Row; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.config.Configuration; import com.fr.config.ServerPreferenceConfig; import com.fr.design.DesignerEnvManager; @@ -10,7 +15,7 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionListener; import com.fr.design.editor.editor.IntegerEditor; import com.fr.design.file.SaveSomeTemplatePane; -import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.design.gui.frpane.FineTabbedPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIColorButton; import com.fr.design.gui.ibutton.UINoThemeColorButton; @@ -31,8 +36,6 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; import com.fr.design.jdk.JdkVersion; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.VerticalFlowLayout; import com.fr.design.mainframe.vcs.VcsConfigManager; import com.fr.design.mainframe.vcs.common.VcsHelper; @@ -44,7 +47,6 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.widget.FRWidgetFactory; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; -import com.fr.general.GeneralContext; import com.fr.general.IOUtils; import com.fr.general.Inter; import com.fr.general.log.Log4jConfig; @@ -52,7 +54,6 @@ import com.fr.io.attr.ImageExportAttr; import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.report.ReportConfigManager; -import com.fr.scheduler.tool.FineScheduler; import com.fr.stable.Constants; import com.fr.stable.os.OperatingSystem; import com.fr.third.apache.logging.log4j.Level; @@ -70,13 +71,10 @@ import com.fr.workspace.server.vcs.v2.scheduler.VcsAutoCleanSchedule; import com.fr.workspace.server.vcs.v2.scheduler.VcsAutoCleanService; import org.jetbrains.annotations.NotNull; -import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.ButtonGroup; -import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFileChooser; -import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; @@ -86,10 +84,17 @@ import javax.swing.SwingUtilities; import javax.swing.SwingWorker; import javax.swing.Timer; import javax.swing.UIManager; -import javax.swing.border.EmptyBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -105,6 +110,13 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.ExecutionException; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; +import static com.fine.theme.utils.FineUIConstants.SCALE_FONT_SIZE_12; import static com.fr.design.i18n.Toolkit.i18nText; /** @@ -127,6 +139,7 @@ public class PreferencePane extends BasicPane { private static final int MEMORY_TIP_LABEL_MAX_WIDTH = 230; private static final int PREFERENCE_LABEL_MAX_WIDTH = 460; private static final int OFFSET_HEIGHT = 60; + private static final int SETTING_V_GAP = 15; private static final int VCS_FILL_TOTAL = 5; private static final String TYPE = "pressed"; @@ -275,109 +288,120 @@ public class PreferencePane extends BasicPane { protected void initComponents() { JPanel contentPane = this; contentPane.setLayout(FRGUIPaneFactory.createBorderLayout()); + // 常用面板 + JPanel generalPane = column(SETTING_V_GAP, + // 功能设置 + cell(createFunctionPane()), + // 编辑器设置 + cell(createEditPane()), + // 颜色设置 + cell(createColorSettingPane()), + // 语言选择 + cell(createLanPane()), + // 启动页配置 + cell(createStartupPagePane()) + ).weight(1).getComponent(); + JPanel generalScrollPane = patchScroll(FineLayoutBuilder.asBorderLayoutWrapped(generalPane)); + + // 高级面板 + JPanel advancePane = column(SETTING_V_GAP, + // log导出配置 + cell(createLogPane()), + // 标尺单位设置 + cell(createLengthPane()), + // 服务器设置 + cell(createServerPane()), + // 插件管理设置 + cell(createUpmSelectorPane()).with(it -> it.setVisible(!OperatingSystem.isLinux() && JdkVersion.LE_8.support())), + // 登录选项 + cell(createLoginSelectorPane()).with(it -> it.setVisible(SupportOSImpl.DESIGNER_LOGIN.support())), + // Oracle设置 + cell(createOraclePane()), + // 内存设置 + cell(createMemoryPane()), + // 产品改良 + cell(createImprovePane()), + // 内置服务器 + /// 暂时不支持跟随启动 +// cell(createEmbeddedServerPane()), + // 模板预览性能 + cell(createTplPreviewPane()), + // 设计器启动选项 + cell(createDesignerStartupPane()) + ).weight(1).getComponent(); + useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager")); + JPanel adviceScrollPane = patchScroll(advancePane); - UITabbedPane jtabPane = new UITabbedPane(); - JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - UIScrollPane generalScrollPane = patchScroll(generalPane); - jtabPane.addTab(i18nText("Fine-Design_Basic_General"), generalScrollPane); - - JPanel advancePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - UIScrollPane adviceScrollPane = patchScroll(advancePane); - jtabPane.addTab(i18nText("Fine-Design_Basic_Advanced"), adviceScrollPane); + // 版本管理面板 //初始化vcs总面板 JPanel vcsParentPane = new JPanel(); CardLayout cardLayout = new CardLayout(); vcsParentPane.setLayout(cardLayout); //vcs配置面板 - JPanel vcsPane = new JPanel(new BorderLayout()); + JPanel vcsPane = new JPanel(new BorderLayout(0, SETTING_V_GAP)); + // vcsPane + createVcsSettingPane(vcsPane, vcsParentPane, cardLayout); //添加滚动条 - UIScrollPane vcsScrollPane = patchScroll(vcsPane); + JPanel vcsScrollPane = patchScroll(vcsPane); //配置面板作为vcs总面板的一张卡片 vcsParentPane.add(vcsScrollPane, VcsMovePanel.SETTING); - jtabPane.addTab(i18nText("Fine-Design_Vcs_Title"), vcsParentPane); - - contentPane.add(jtabPane, BorderLayout.NORTH); - - createFunctionPane(generalPane); - createEditPane(generalPane); - createColorSettingPane(generalPane); - - // vcsPane - createVcsSettingPane(vcsPane, vcsParentPane, cardLayout); - - // ConfPane - JPanel confLocationPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - advancePane.add(confLocationPane); - - createLogPane(advancePane); - createLanPane(generalPane); + FineTabbedPane tabbedPane = FineTabbedPane.builder() + .addTab(i18nText("Fine-Design_Basic_General"), generalScrollPane) + .addTab(i18nText("Fine-Design_Basic_Advanced"), adviceScrollPane) + .addTab(i18nText("Fine-Design_Vcs_Title"), vcsParentPane) + .build(); + contentPane.add(tabbedPane, BorderLayout.CENTER); - createStartupPagePane(generalPane); - - createLengthPane(advancePane); - - createServerPane(advancePane); - - JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + i18nText("Fine-Design_Basic_Oracle_All_Tables")); - oracleSpace = new UICheckBox(i18nText("Fine-Design_Basic_Show_All_Oracle_Tables")); - oraclePane.add(oracleSpace); + } - if (!OperatingSystem.isLinux() && JdkVersion.LE_8.support()) { - JPanel upmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Update_Plugin_Manager")); - useOptimizedUPMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Update_Plugin_Manager")); - upmSelectorPane.add(useOptimizedUPMCheckbox); - advancePane.add(upmSelectorPane); - } + private Component createDesignerStartupPane() { + cloudAnalyticsDelayCheckBox = new UICheckBox(i18nText("Fine-Design_Cloud_Analytics_Delay")); + return FineUIUtils.wrapComponentWithTitle(column(10, cell(cloudAnalyticsDelayCheckBox)).getComponent(), + i18nText("Fine-Design_Startup_Option")); + } - if (SupportOSImpl.DESIGNER_LOGIN.support()) { - JPanel loginSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Login_Manager")); - useNewVersionLoginCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Login_Manager")); - loginSelectorPane.add(useNewVersionLoginCheckbox); - advancePane.add(loginSelectorPane); - } + private Component createTplPreviewPane() { + imageCompressPanelCheckBox = new UICheckBox(i18nText("Fine-Design_Image_Compress")); + return FineUIUtils.wrapComponentWithTitle(column(10, + cell(imageCompressPanelCheckBox), + cell(createImageExportSettingPane()) + ).getComponent(), + i18nText("Fine-Design_Template_Preview_Performance")); + } - JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager")); - useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager")); - //dbmSelectorPane.add(useUniverseDBMCheckbox); - //advancePane.add(dbmSelectorPane); + private Component createEmbeddedServerPane() { + embedServerLazyStartupCheckBox = new UICheckBox(i18nText("Fine-Design_Startup_When_Needed")); + return FineUIUtils.wrapComponentWithTitle(column(10, cell(embedServerLazyStartupCheckBox)).getComponent(), + i18nText("Fine-Design_Embed_Server")); + } - JPanel improvePane = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Product_Improve")); + private Component createImprovePane() { joinProductImproveCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Join_Product_Improve")); - improvePane.add(joinProductImproveCheckBox); + autoPushUpdateCheckBox = new UICheckBox(i18nText("Fine-Design_Automatic_Push_Update")); + JPanel improvePane = column(10, + cell(joinProductImproveCheckBox), + cell(autoPushUpdateCheckBox).with(it -> it.setVisible(SupportOSImpl.AUTOPUSHUPDATE.support())) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(improvePane, i18nText("Fine-Design_Basic_Product_Improve")); + } - if (SupportOSImpl.AUTOPUSHUPDATE.support()) { - autoPushUpdateCheckBox = new UICheckBox(i18nText("Fine-Design_Automatic_Push_Update")); - improvePane.add(autoPushUpdateCheckBox); - } - /* - if (DesignerPushUpdateManager.getInstance().isAutoPushUpdateSupported()) { - autoPushUpdateCheckBox = new UICheckBox(i18nText("Fine-Design_Automatic_Push_Update")); - improvePane.add(autoPushUpdateCheckBox); - }*/ - - JPanel spaceUpPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - spaceUpPane.add(oraclePane, BorderLayout.NORTH); - spaceUpPane.add(createMemoryPane(), BorderLayout.CENTER); - spaceUpPane.add(improvePane, BorderLayout.SOUTH); - advancePane.add(spaceUpPane); - - JPanel embedServerPanel = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Embed_Server")); - embedServerLazyStartupCheckBox = new UICheckBox(i18nText("Fine-Design_Startup_When_Needed")); - embedServerPanel.add(embedServerLazyStartupCheckBox); - /// 暂时不支持跟随启动 - //advancePane.add(embedServerPanel); + private Component createOraclePane() { + oracleSpace = new UICheckBox(i18nText("Fine-Design_Basic_Show_All_Oracle_Tables")); + return FineUIUtils.wrapComponentWithTitle(column(10, cell(oracleSpace)).getComponent(), + i18nText("Fine-Design_Basic_Oracle_All_Tables")); + } - JPanel imageCompressPanel = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Template_Preview_Performance")); - imageCompressPanelCheckBox = new UICheckBox(i18nText("Fine-Design_Image_Compress")); - imageCompressPanel.add(imageCompressPanelCheckBox); - imageCompressPanel.add(createImageExportSettingPane()); - advancePane.add(imageCompressPanel); + private Component createLoginSelectorPane() { + useNewVersionLoginCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Login_Manager")); + return FineUIUtils.wrapComponentWithTitle(column(10, cell(useNewVersionLoginCheckbox)).getComponent(), + i18nText("Fine-Design_Basic_Login_Manager")); + } - JPanel designerStartupOption = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Startup_Option")); - cloudAnalyticsDelayCheckBox = new UICheckBox(i18nText("Fine-Design_Cloud_Analytics_Delay")); - designerStartupOption.add(cloudAnalyticsDelayCheckBox); - advancePane.add(designerStartupOption); + private Component createUpmSelectorPane() { + useOptimizedUPMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Update_Plugin_Manager")); + return FineUIUtils.wrapComponentWithTitle(column(10, cell(useOptimizedUPMCheckbox)).getComponent(), + i18nText("Fine-Design_Basic_Update_Plugin_Manager")); } private JPanel createImageExportSettingPane() { @@ -392,42 +416,31 @@ public class PreferencePane extends BasicPane { ButtonGroup previewRenderGroup = new ButtonGroup(); previewRenderGroup.add(previewRenderQuality); previewRenderGroup.add(previewRenderSpeed); - JPanel imageExportSettingPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - JComponent[][] templateComps = { - {new UILabel(Toolkit.i18nText("Fine-Design_Report_Engine_Enlarge_Or_Reduce") + ":"), this.previewResolutionBtnS, this.previewResolutionBtnM}, - {new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Rendering_Quality") + ":"), this.previewRenderQuality, this.previewRenderSpeed}, - }; - imageExportSettingPane.add( - TableLayoutHelper.createGapTableLayoutPane( - templateComps, - new double[]{TableLayout.FILL, TableLayout.FILL}, - new double[]{TableLayout.FILL, TableLayout.FILL, TableLayout.FILL}, - 20, 0), - BorderLayout.CENTER); - imageExportSettingPane.setBorder(BorderFactory.createEmptyBorder(0, 3, 0, 0)); - return imageExportSettingPane; + return column(10, + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_Engine_Enlarge_Or_Reduce") + ":")).weight(1), + cell(this.previewResolutionBtnS).weight(1), + cell(this.previewResolutionBtnM).weight(1) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Rendering_Quality") + ":")).weight(1), + cell(this.previewRenderQuality).weight(1), + cell(this.previewRenderSpeed).weight(1) + ) + ).getComponent(); } @NotNull - private UIScrollPane patchScroll(JPanel generalPane) { - UIScrollPane generalPanelWithScroll = new UIScrollPane(generalPane, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - generalPanelWithScroll.setBorder(new EmptyBorder(0, 0, 0, 0)); - generalPanelWithScroll.setPreferredSize(new Dimension(generalPane.getWidth(), 600)); - return generalPanelWithScroll; + private JPanel patchScroll(JPanel generalPane) { + UIScrollPane uiScrollPane = new UIScrollPane(FineLayoutBuilder.asBorderLayoutWrapped(generalPane), + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + return FineLayoutBuilder.asBorderLayoutWrapped(uiScrollPane); } - private void createVcsSettingPane(JPanel generalPane,JPanel parentPane, CardLayout cardLayout) { + private void createVcsSettingPane(JPanel generalPane, JPanel parentPane, CardLayout cardLayout) { //迁移面板 movePanel = createMovePane(cardLayout, parentPane); generalPane.add(movePanel, BorderLayout.NORTH); - JPanel savePane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Vcs_Save_Setting")); - JPanel vcsPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Vcs_Clean_Setting")); - JPanel containPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - containPane.add(savePane); - containPane.add(vcsPane); - //填充一下面板 - fillPane(containPane, VCS_FILL_TOTAL); - generalPane.add(containPane, BorderLayout.CENTER); remindVcsLabel = new UILabel(i18nText("Fine-Design_Vcs_Remind")); remindVcsLabel.setVisible(!VcsHelper.getInstance().needInit()); vcsEnableCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_SaveAuto")); @@ -436,55 +449,59 @@ public class PreferencePane extends BasicPane { saveCommitCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_No_Delete")); saveIntervalEditor = new UIPositiveIntEditor(60); useIntervalCheckBox = new UICheckBox(); - savePane.add(vcsEnableCheckBox); - savePane.add(saveIntervalPane); - //gc面板 - gcControlPane = createGcControlPane(); - - JPanel enableVcsPanel = new JPanel(FRGUIPaneFactory.createLeftZeroLayout()); - enableVcsPanel.add(remindVcsLabel); - JPanel intervalPanel = new JPanel(FRGUIPaneFactory.createLeftZeroLayout()); final UILabel everyLabel = new UILabel(i18nText("Fine-Design_Vcs_Every")); final UILabel delayLabel = new UILabel(i18nText("Fine-Design_Vcs_Delay")); - intervalPanel.add(useIntervalCheckBox); - intervalPanel.add(everyLabel); - intervalPanel.add(saveIntervalEditor); - intervalPanel.add(delayLabel); + JPanel intervalPanel = row(4, + cell(useIntervalCheckBox), + cell(everyLabel), + cell(saveIntervalEditor), + cell(delayLabel) + ).getComponent(); + autoCleanPane = createAutoCleanPane(); checkAutoScheduleStartAndUpdateStatus(); - vcsEnableCheckBox.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - boolean selected = vcsEnableCheckBox.isSelected(); - if (selected && vcsEnableCheckBox.isEnabled()) { - saveCommitCheckBox.setEnabled(true); - saveIntervalEditor.setEnabled(true); - useIntervalCheckBox.setEnabled(true); - everyLabel.setEnabled(true); - delayLabel.setEnabled(true); - } else { - saveCommitCheckBox.setEnabled(false); - saveIntervalEditor.setEnabled(false); - useIntervalCheckBox.setEnabled(false); - everyLabel.setEnabled(false); - delayLabel.setEnabled(false); - } + vcsEnableCheckBox.addChangeListener(e -> { + boolean selected = vcsEnableCheckBox.isSelected(); + if (selected && vcsEnableCheckBox.isEnabled()) { + saveCommitCheckBox.setEnabled(true); + saveIntervalEditor.setEnabled(true); + useIntervalCheckBox.setEnabled(true); + everyLabel.setEnabled(true); + delayLabel.setEnabled(true); + } else { + saveCommitCheckBox.setEnabled(false); + saveIntervalEditor.setEnabled(false); + useIntervalCheckBox.setEnabled(false); + everyLabel.setEnabled(false); + delayLabel.setEnabled(false); } }); - vcsPane.add(enableVcsPanel); - vcsPane.add(intervalPanel); - if (VcsHelper.getInstance().isLegacyMode()) { - vcsPane.add(saveCommitCheckBox); - } - vcsPane.add(autoCleanPane); - boolean support = VcsHelper.getInstance().checkV2FunctionSupport(); - saveIntervalPane.setVisible(support); - autoCleanPane.setVisible(support); - if (VcsHelper.getInstance().isLegacyMode()) { - // 老版本时才显示gc选项 - vcsPane.add(gcControlPane); - } + //gc面板 + gcControlPane = createGcControlPane(); + + boolean supportV2 = VcsHelper.getInstance().checkV2FunctionSupport(); + boolean legacyMode = VcsHelper.getInstance().isLegacyMode(); + + Component savePane = FineUIUtils.wrapComponentWithTitle(column(10, + cell(vcsEnableCheckBox), + cell(saveIntervalPane).with(it -> it.setVisible(supportV2)) + ).getComponent(), i18nText("Fine-Design_Vcs_Save_Setting")); + + Component vcsPane = FineUIUtils.wrapComponentWithTitle(column(10, + cell(remindVcsLabel), + cell(intervalPanel), + cell(saveCommitCheckBox).with(it -> it.setVisible(legacyMode)), + cell(autoCleanPane).with(it -> it.setVisible(supportV2)), + cell(gcControlPane).with(it -> it.setVisible(legacyMode)) + ).getComponent(), i18nText("Fine-Design_Vcs_Clean_Setting")); + JPanel containPane = column(SETTING_V_GAP, + cell(savePane), + cell(vcsPane) + ).getComponent(); + //填充一下面板 + fillPane(containPane, VCS_FILL_TOTAL); + generalPane.add(containPane, BorderLayout.CENTER); } private void fillPane(JPanel containPane, int total) { @@ -510,12 +527,15 @@ public class PreferencePane extends BasicPane { }; private JPanel createAutoCleanPane() { - JPanel autoCleanPane = new JPanel(FRGUIPaneFactory.createLeftZeroLayout()); + Row autoCleanPane = new Row(); + autoCleanPane.setSpacing(2); useVcsAutoCleanScheduleCheckBox = new UICheckBox(); autoCleanIntervalComboBox = new UIComboBox(INTERVAL); autoCleanIntervalComboBox.setSelectedIndex(DEFAULT_INDEX); autoCleanRetainIntervalComboBox = new UIComboBox(INTERVAL); autoCleanRetainIntervalComboBox.setSelectedIndex(DEFAULT_INDEX); + autoCleanIntervalComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + autoCleanRetainIntervalComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); autoCleanPane.add(useVcsAutoCleanScheduleCheckBox); autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Every"))); autoCleanPane.add(autoCleanIntervalComboBox); @@ -561,20 +581,16 @@ public class PreferencePane extends BasicPane { } private JPanel createSaveIntervalPane() { - JPanel saveIntervalPane = new JPanel(FRGUIPaneFactory.createLeftZeroLayout()); useVcsAutoSaveScheduleCheckBox = new UICheckBox(); autoSaveIntervalEditor = new UIPositiveIntEditor(60); - saveIntervalPane.add(useVcsAutoSaveScheduleCheckBox); - saveIntervalPane.add(new UILabel(i18nText("Fine-Design_Vcs_Every"))); - saveIntervalPane.add(autoSaveIntervalEditor); - saveIntervalPane.add(new UILabel(i18nText("Fine-Design_Vcs_Save_Delay"))); - useVcsAutoSaveScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode()); - saveIntervalPane.setVisible(false); - return saveIntervalPane; + return row(4, + cell(useVcsAutoSaveScheduleCheckBox).with(it -> it.setEnabled(!VcsHelper.getInstance().isLegacyMode())), + cell(new UILabel(i18nText("Fine-Design_Vcs_Every"))), + cell(autoSaveIntervalEditor), + cell(new UILabel(i18nText("Fine-Design_Vcs_Save_Delay"))) + ).with(it -> it.setVisible(false)).getComponent(); } - - /** * 模创建板版本gc 配置操作面板 * @@ -604,22 +620,14 @@ public class PreferencePane extends BasicPane { return gcControlPane; } - private void createFunctionPane(JPanel generalPane) { - JPanel topVerticalTitledBorderPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Preference_Function")); - JPanel supportUndoPanel = new JPanel(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout()); - topVerticalTitledBorderPane.add(supportUndoPanel); - generalPane.add(topVerticalTitledBorderPane); - - + private Component createFunctionPane() { //添加supportUndo选择项 supportUndoCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Preference_Support_Undo")); - supportUndoPanel.add(supportUndoCheckBox); //添加maxUndoLimit - //String[] undoTimes = {"最大撤销次数","5次","10次","15次","20次","50次"}; String[] undoTimes = {i18nText("Fine-Design_Basic_Max_Undo_Limit"), MAX_UNDO_LIMIT_5 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_10 + i18nText("Fine-Design_Basic_Time(s)") , MAX_UNDO_LIMIT_15 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_20 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_50 + i18nText("Fine-Design_Basic_Time(s)")}; maxUndoLimit = new UIComboBox(undoTimes); - supportUndoPanel.add(maxUndoLimit); + maxUndoLimit.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); //不支持撤销则不能选择撤销可缓存，也不能设置最大撤销次数 supportUndoCheckBox.addActionListener(new ActionListener() { @@ -629,32 +637,31 @@ public class PreferencePane extends BasicPane { } }); - //添加supportDefaultParentCalculate选择项 supportDefaultParentCalculateCheckBox = new UICheckBox( i18nText("Fine-Design_Basic_Preference_Support_Default_Parent_Calculate")); - topVerticalTitledBorderPane.add(supportDefaultParentCalculateCheckBox); - //添加是否展示打开模板提示缺少插件选择项 showTemplateMissingPlugin = new UICheckBox( i18nText("Fine-Design_Basic_Preference_Show-Template-Missing-Plugin")); - topVerticalTitledBorderPane.add(showTemplateMissingPlugin); startWithEmptyFile = new UICheckBox(i18nText("Fine-Design_Basic_Preference_Start_Empty_File")); - topVerticalTitledBorderPane.add(startWithEmptyFile); + + JPanel functionPanel = column(10, + row(10, + cell(supportUndoCheckBox), cell(maxUndoLimit) + ), + cell(supportDefaultParentCalculateCheckBox), + cell(showTemplateMissingPlugin), + cell(startWithEmptyFile) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(functionPanel, i18nText("Fine-Design_Basic_Preference_Function")); } - private void createEditPane(JPanel generalPane) { + private Component createEditPane() { //samuel:编辑器设置 - JPanel editPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference")); - generalPane.add(editPane); - //设置是否支持将字符串编辑为公式 supportStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Report_Support_String_To_Formula")); - editPane.add(supportStringToFormulaBox); - //是否默认转化 defaultStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Basic_Always")); - //不支持转化则不能默认执行 supportStringToFormulaBox.addActionListener(new ActionListener() { @Override @@ -662,16 +669,8 @@ public class PreferencePane extends BasicPane { defaultStringToFormulaBox.setEnabled(supportStringToFormulaBox.isSelected()); } }); - JPanel keyStrokePane = new JPanel(new BorderLayout()); - keyStrokePane.add(new UILabel(i18nText("Fine-Design_Basic_Support_Auto_Complete_Shortcut") + ":"), BorderLayout.WEST); + UILabel shortCutInfoLabel = new UILabel(i18nText("Fine-Design_Basic_Support_Auto_Complete_Shortcut") + ":"); shortCutLabel = new UILabel(); - keyStrokePane.add(shortCutLabel, BorderLayout.CENTER); - keyStrokePane.setBorder(new EmptyBorder(0, 10,0,0)); - - JPanel defaultExecutePane = new JPanel(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout()); - defaultExecutePane.add(defaultStringToFormulaBox); - defaultExecutePane.add(keyStrokePane); - editPane.add(defaultExecutePane); shortCutLabel.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { @@ -687,6 +686,16 @@ public class PreferencePane extends BasicPane { } } }); + JPanel editPanel = column(10, + cell(supportStringToFormulaBox), + row( + cell(defaultStringToFormulaBox), + fix(10), + cell(shortCutInfoLabel), + cell(shortCutLabel) + ) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(editPanel, i18nText("Fine-Design_Basic_Editor_Preference")); } private class KeyStrokePane extends BasicPane { @@ -730,39 +739,28 @@ public class PreferencePane extends BasicPane { } - private void createColorSettingPane(JPanel generalPane) { + private Component createColorSettingPane() { // Color Setting Pane - JPanel colorSettingPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Preference_Setting_Colors")); - generalPane.add(colorSettingPane); - gridLineColorTBButton = new UINoThemeColorButton(IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png")); gridLineColorTBButton.setEnabled(this.isEnabled()); paginationLineColorTBButton = new UINoThemeColorButton(IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png")); paginationLineColorTBButton.setEnabled(this.isEnabled()); - JPanel leftPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - leftPane.add(new UILabel(i18nText("Fine-Design_Basic_Preference_Grid_Line_Color") + ":")); - leftPane.add(gridLineColorTBButton); - JPanel rightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - rightPane.add(new UILabel(i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color") + ":")); - rightPane.add(paginationLineColorTBButton); - colorSettingPane.add(leftPane); - colorSettingPane.add(rightPane); + JPanel colorPanel = row(10, + cell(new UILabel(i18nText("Fine-Design_Basic_Preference_Grid_Line_Color") + ":")), + cell(gridLineColorTBButton), + cell(new UILabel(i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color") + ":")), + cell(paginationLineColorTBButton) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(colorPanel, i18nText("Fine-Design_Basic_Preference_Setting_Colors")); } - private void createLogPane(JPanel advancePane) { + private Component createLogPane() { //richer:选择导出log文件的目录. - JPanel logPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - advancePane.add(logPane); - JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + i18nText("Fine-Design_Basic_Export_Setting")); - logPane.add(logExportPane); UILabel logLabel = new UILabel(i18nText("Fine-Design_Basic_Select_Export_Log_Directory") + ":"); - logExportPane.add(logLabel, BorderLayout.WEST); logExportDirectoryField = new UITextField(24); - logExportPane.add(logExportDirectoryField, BorderLayout.CENTER); UIButton chooseDirBtn = new UIButton("..."); - logExportPane.add(chooseDirBtn, BorderLayout.EAST); chooseDirBtn.setPreferredSize(new Dimension(25, 25)); chooseDirBtn.addActionListener(new ActionListener() { @Override @@ -777,46 +775,40 @@ public class PreferencePane extends BasicPane { } } }); - - JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + i18nText("Fine-Design_Basic_Level_Setting")); - logPane.add(logLevelPane); + UILabel logLevelLabel = new UILabel("Log" + i18nText("Fine-Design_Basic_Level_Setting")); logLevelComboBox = new UIComboBox(LOG); logLevelComboBox.setEnabled(WorkContext.getCurrent().isLocal()); - logLevelPane.add(logLevelComboBox); + JPanel logPanel = row(10, + cell(logLabel), + cell(logExportDirectoryField), + cell(chooseDirBtn), + cell(logLevelLabel), + cell(logLevelComboBox).with(it -> it.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX)) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(logPanel, "Log" + i18nText("Fine-Design_Basic_Export_Setting")); } - private void createLanPane(JPanel generalPane) { + private Component createLanPane() { // ben:选择版本语言; - JPanel languageAndDashBoard_pane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Choose_Language")); - generalPane.add(languageAndDashBoard_pane); - languageAndDashBoard_pane.add(LanguagePane); - languageComboBox = createLanguageComboBox(); - ActionLabel languageLabel = new ActionLabel(i18nText("Fine-Design_Basic_Designer_Language")); - languageLabel.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - final LocalePane localePane = new LocalePane(); - BasicDialog dlg = localePane.showLargeWindow(SwingUtilities.getWindowAncestor(PreferencePane.this), new DialogActionAdapter() { - @Override - public void doOk() { - localePane.save(); - } - }); - dlg.setVisible(true); - } + languageLabel.addActionListener(e -> { + final LocalePane localePane = new LocalePane(); + BasicDialog dlg = localePane.showLargeWindow(SwingUtilities.getWindowAncestor(PreferencePane.this), new DialogActionAdapter() { + @Override + public void doOk() { + localePane.save(); + } + }); + dlg.setVisible(true); }); UILabel noticeLabel = new UILabel(i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));//sail:提示重启后生效 - double p = TableLayout.PREFERRED; - double[] rowSize = {p}; - double[] columnSize = {p, p, p}; - Component[][] components = { - {languageLabel, languageComboBox, noticeLabel}, - }; - JPanel choosePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - LanguagePane.add(choosePane); + JPanel langPanel = row(10, + cell(languageLabel), + cell(languageComboBox), + cell(noticeLabel) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(langPanel, i18nText("Fine-Design_Basic_Choose_Language")); } private UIDictionaryComboBox createLanguageComboBox() { @@ -832,23 +824,20 @@ public class PreferencePane extends BasicPane { i++; } UIDictionaryComboBox languageComboBox = new UIDictionaryComboBox<>(keys, values); - languageComboBox.setFont(FRFont.getInstance("Dialog", Font.PLAIN, 12));//为了在中文系统中显示韩文 + languageComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + languageComboBox.setFont(FRFont.getInstance("Dialog", Font.PLAIN, SCALE_FONT_SIZE_12));//为了在中文系统中显示韩文 return languageComboBox; } - - private void createStartupPagePane(JPanel generalPane) { - - // ben:选择版本语言; - JPanel startupPagePaneWrapper = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - JPanel startupPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Startup_Page_Config")); - generalPane.add(startupPagePaneWrapper); - startupPagePaneWrapper.add(startupPane); - + + private Component createStartupPagePane() { startupPageEnabledCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Startup_Page_Config_Check_Text")); - startupPane.add(startupPageEnabledCheckBox); UILabel descLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Startup_Page_Config_Desc"), PREFERENCE_LABEL_MAX_WIDTH); - descLabel.setForeground(new Color(51, 51, 52, (int)Math.round(0.5 * 255))); - startupPane.add(descLabel); + FineUIStyle.setStyle(descLabel, FineUIStyle.LABEL_TIP); + JPanel startPanel = column(10, + cell(startupPageEnabledCheckBox), + cell(descLabel) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(startPanel, i18nText("Fine-Design_Startup_Page_Config")); } private String getDisplayShortCut(String shotrCut) { @@ -864,60 +853,44 @@ public class PreferencePane extends BasicPane { } - private void createLengthPane(JPanel advancePane) { - double p = TableLayout.PREFERRED; - double[] rowSize = {p}; - + private Component createLengthPane() { // 长度单位选择 - JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Setting_Ruler_Units")); - advancePane.add(lengthPane); pageLengthComboBox = new UIComboBox(new String[]{i18nText("Fine-Design_Basic_Page_Setup_MM"), i18nText("Fine-Design_Report_Unit_CM"), i18nText("Fine-Design_Report_Unit_INCH")}); - pageLengthComboBox.setPreferredSize(new Dimension(80, 20)); - pageLengthComboBox.setMinimumSize(new Dimension(80, 20)); reportLengthComboBox = new UIComboBox(UnitConvertUtil.getUnitItems()); - reportLengthComboBox.setPreferredSize(new Dimension(80, 20)); - reportLengthComboBox.setMinimumSize(new Dimension(80, 20)); - UILabel pagelengthLabel = new UILabel(i18nText("Fine-Design_Basic_Page_Setup_Scale_Units") + ":"); + UILabel pageLengthLabel = new UILabel(i18nText("Fine-Design_Basic_Page_Setup_Scale_Units") + ":"); UILabel reportLengthLabel = new UILabel(i18nText("Fine-Design_Basic_Report_Design_Ruler_Units") + ":"); - Component[][] lengthComponents = { - {pagelengthLabel, pageLengthComboBox, reportLengthLabel, reportLengthComboBox}, - }; - JPanel chooseLengthPane = TableLayoutHelper.createTableLayoutPane(lengthComponents, rowSize, new double[]{p, p, p, p}); - lengthPane.add(chooseLengthPane); + JPanel lengthPane = row(10, + cell(pageLengthLabel), + cell(pageLengthComboBox), + cell(reportLengthLabel), + cell(reportLengthComboBox) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(lengthPane, i18nText("Fine-Design_Basic_Setting_Ruler_Units")); } - private void createServerPane(JPanel advancePane) { - double p = TableLayout.PREFERRED; - double[] rowSize = {p}; - double[] columnSize = {p, p, p}; - - JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Web_Preview_Port_Setting")); - advancePane.add(serverPortPane); + private Component createServerPane() { portEditor = new IntegerEditor(); - portEditor.setPreferredSize(new Dimension(80, 20)); - portEditor.setMinimumSize(new Dimension(80, 20)); UILabel notiJlabel = new UILabel(i18nText("Fine-Design_Basic_Work_After_Restart_Designer")); UILabel serverPortLabel = new UILabel(i18nText("Fine-Design_Basic_Web_Preview_Port") + ":"); - Component[][] portComponents = { - {serverPortLabel, portEditor, notiJlabel}, - }; - JPanel choosePortPane = TableLayoutHelper.createTableLayoutPane(portComponents, rowSize, columnSize); - serverPortPane.add(choosePortPane, BorderLayout.CENTER); + JPanel serverPane = row(10, + cell(serverPortLabel), + cell(portEditor), + cell(notiJlabel) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(serverPane, i18nText("Fine-Design_Basic_Web_Preview_Port_Setting")); } - private JPanel createMemoryPane() { - JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Preference_Caching_Template")); + private Component createMemoryPane() { UILabel memoryLabel = new UILabel(i18nText("Fine-Design_Basic_Preference_Max_Caching_Template")); UILabel memoryTipLabel = FRWidgetFactory.createLineWrapLabel( i18nText("Fine-Design_Basic_Preference_Caching_Template_Tip"), MEMORY_TIP_LABEL_MAX_WIDTH); - memoryTipLabel.setBorder(BorderFactory.createEmptyBorder(0, CACHING_GAP, 0, 0)); cachingTemplateSpinner = new UISpinner(0, CACHING_MAX, 1, CACHING_DEFAULT); - JPanel memorySpace = new JPanel(FRGUIPaneFactory.createLeftZeroLayout()); - memorySpace.add(memoryLabel); - memorySpace.add(cachingTemplateSpinner); - memorySpace.add(memoryTipLabel); - memoryPane.add(memorySpace); - return memoryPane; + JPanel memoryPane = row(5, + cell(memoryLabel), + cell(cachingTemplateSpinner), + cell(memoryTipLabel) + ).getComponent(); + return FineUIUtils.wrapComponentWithTitle(memoryPane, i18nText("Fine-Design_Basic_Preference_Caching_Template")); } @Override @@ -1290,7 +1263,7 @@ public class PreferencePane extends BasicPane { @Override public BasicDialog showWindow(Window window, DialogActionListener l) { - return showWindowWithCustomSize(window, l, new Dimension(BasicDialog.DEFAULT.width, this.getPreferredSize().height + OFFSET_HEIGHT)); + return showWindowWithCustomSize(window, l, new Dimension(BasicDialog.DEFAULT.width, BasicDialog.DEFAULT.height + OFFSET_HEIGHT)); } private void tryGc() { @@ -1486,7 +1459,7 @@ public class PreferencePane extends BasicPane { */ private UIButton initGcButton() { UIButton gcButton = new UIButton(i18nText("Fine-Design_Vcs_Clean")); - gcButton.setPreferredSize(new Dimension(100, 15)); + gcButton.setPreferredSize(FineUIScale.scale(new Dimension(100, 15))); gcButton.setRoundBorder(true, Constants.LEFT); return gcButton; } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/RenameAction.java b/designer-base/src/main/java/com/fr/design/actions/file/RenameAction.java index 842292ce2a..ac19f107b6 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/RenameAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/RenameAction.java @@ -1,5 +1,9 @@ package com.fr.design.actions.file; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.chartx.TwoTuple; import com.fr.design.DesignerEnvManager; @@ -62,7 +66,7 @@ public class RenameAction extends UpdateAction { public RenameAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Rename")); - this.setSmallIcon("/com/fr/design/standard/rename/rename"); + this.setSmallIcon(new LazyIcon("rename")); } @Override @@ -145,7 +149,7 @@ public class RenameAction extends UpdateAction { "Fine-Design_Basic_Enter_New_Folder_Name" : "Fine-Design_Basic_Enter_New_File_Name") ); newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); - newNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10)); + newNameLabel.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); //newNameLabel.setPreferredSize(new Dimension(118, 15)); // 重命名输入框 @@ -168,10 +172,10 @@ public class RenameAction extends UpdateAction { } }); nameField.selectAll(); - nameField.setPreferredSize(new Dimension(170, 20)); + nameField.setPreferredSize(FineUIScale.scale(new Dimension(170, 20))); JPanel topPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 5)); - topPanel.setBorder(BorderFactory.createEmptyBorder(15, 15, 0, 15)); + topPanel.setBorder(new ScaledEmptyBorder(15, 15, 0, 15)); topPanel.add(newNameLabel); topPanel.add(nameField); @@ -179,18 +183,19 @@ public class RenameAction extends UpdateAction { nameField.addKeyListener(keyListener); // 重名提示 warnLabel = new UILabel(); - warnLabel.setPreferredSize(new Dimension(300, 50)); + warnLabel.setPreferredSize(FineUIScale.scale(new Dimension(300, 50))); warnLabel.setHorizontalAlignment(SwingConstants.LEFT); warnLabel.setVerticalAlignment(SwingConstants.TOP); warnLabel.setForeground(Color.RED); warnLabel.setVisible(false); JPanel midPanel = new JPanel(new BorderLayout()); - midPanel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 15)); + midPanel.setBorder(new ScaledEmptyBorder(0, 15, 0, 15)); midPanel.add(warnLabel, BorderLayout.WEST); // 确认按钮 confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Confirm")); + FineUIStyle.setStyle(confirmButton, FineUIStyle.STYLE_PRIMARY); confirmButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -210,8 +215,8 @@ public class RenameAction extends UpdateAction { }); - JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, 10, 0)); - buttonsPane.setBorder(BorderFactory.createEmptyBorder(10, 15, 10, 10)); + JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, 8, 0)); + buttonsPane.setBorder(new ScaledEmptyBorder(0, 0, 10, 0)); buttonsPane.add(confirmButton); buttonsPane.add(cancelButton); @@ -227,7 +232,7 @@ public class RenameAction extends UpdateAction { ), BorderLayout.CENTER); - this.setSize(340, 200); + this.setSize(FineUIScale.scale(340), FineUIScale.scale(200)); this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Rename")); this.setResizable(false); this.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java index b957e15630..071c6d001e 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java @@ -3,13 +3,13 @@ */ package com.fr.design.actions.file; -import java.awt.event.ActionEvent; - -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.JTemplateAction; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; +import java.awt.event.ActionEvent; + /** * Save as file */ @@ -20,7 +20,7 @@ public class SaveAsTemplateAction extends JTemplateAction> { this.setMenuKeySet(KeySetUtils.SAVE_AS_TEMPLATE); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_file/saveAs"); + this.setSmallIcon(new LazyIcon("saveAs")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java index 072a127aa9..52a57b3a92 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java @@ -3,12 +3,13 @@ */ package com.fr.design.actions.file; -import java.awt.event.ActionEvent; - +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.JTemplateAction; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; +import java.awt.event.ActionEvent; + /** * @author richer * @since 6.5.3 @@ -20,7 +21,7 @@ public class SaveTemplateAction extends JTemplateAction> { this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_file/save"); + this.setSmallIcon(new LazyIcon("saveFile")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index 1a421c5fd0..25070013f3 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -1,5 +1,6 @@ package com.fr.design.actions.file; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.EnvChangeEntrance; import com.fr.design.actions.UpdateAction; @@ -28,7 +29,7 @@ public class SwitchExistEnv extends MenuDef { Iterator nameIt = DesignerEnvManager.getEnvManager().getEnvNameIterator(); while (nameIt.hasNext()) { String name = nameIt.next(); - this.setIconPath("com/fr/design/images/m_file/switch"); + this.setIcon(new LazyIcon("switchEnv")); this.addShortCut(new GetExistEnvAction(name)); } this.addShortCut(SeparatorDef.DEFAULT); @@ -45,11 +46,11 @@ public class SwitchExistEnv extends MenuDef { DesignerWorkspaceInfo env = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName); switch (env.getType()) { case Local: { - this.setSmallIcon("com/fr/design/images/data/bind/localconnect"); + this.setSmallIcon(new LazyIcon("localConnect")); break; } case Remote: { - this.setSmallIcon("com/fr/design/images/data/bind/distanceconnect"); + this.setSmallIcon(new LazyIcon("remoteConnect")); break; } } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java index 4dcc53a13c..8bf83e78c1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java @@ -8,7 +8,8 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.MenuKeySet; -import javax.swing.*; +import com.fr.general.IOUtils; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; /** @@ -19,6 +20,7 @@ public class AboutAction extends UpdateAction { this.setMenuKeySet(ABOUT); this.setName(getMenuKeySet().getMenuKeySetName()+"..."); this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/blank.gif")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java index 0ff9723e50..ac88bd9741 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java @@ -1,6 +1,8 @@ package com.fr.design.actions.help; -import com.fr.design.gui.frpane.UITabbedPane; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.fr.design.gui.frpane.FineTabbedPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; @@ -37,17 +39,20 @@ public class AboutDialog extends JDialog implements ActionListener { this.setTitle(ProductConstants.PRODUCT_NAME); this.setResizable(false); - JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane(); + JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); this.setContentPane(defaultPane); okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); + FineUIStyle.setStyle(okButton, FineUIStyle.STYLE_PRIMARY); okButton.addActionListener(this); - tabbedPane = new UITabbedPane(); sysPane = new SystemInfoPane(); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Basic_System"), sysPane); + tabbedPane = FineTabbedPane.builder() + .addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel) + .addTab(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Basic_System"), sysPane) + .withHeadRatio(0.3f) + .build(); buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); buttonPanel.add(okButton); @@ -63,7 +68,7 @@ public class AboutDialog extends JDialog implements ActionListener { //esp. InputMap inputMapAncestor = defaultPane.getInputMap( - JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); ActionMap actionMap = defaultPane.getActionMap(); //transfer focus to CurrentEditor @@ -76,7 +81,7 @@ public class AboutDialog extends JDialog implements ActionListener { this.getRootPane().setDefaultButton(okButton); - this.setSize(defaultPane.getPreferredSize().width, 600); + this.setSize(FineUIScale.scale(new Dimension(defaultPane.getPreferredSize().width, 620))); GUICoreUtils.centerWindow(this); } @@ -93,6 +98,6 @@ public class AboutDialog extends JDialog implements ActionListener { private SystemInfoPane sysPane; private JPanel buttonPanel; - private UITabbedPane tabbedPane; + private FineTabbedPane tabbedPane; private UIButton okButton; } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 0b25058664..8210712049 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -3,6 +3,8 @@ */ package com.fr.design.actions.help; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.FRContext; import com.fr.base.GraphHelper; import com.fr.design.DesignerEnvManager; @@ -31,6 +33,8 @@ import java.awt.event.MouseEvent; import java.net.URI; import java.util.Locale; +import static com.fine.swing.ui.layout.Layouts.column; + public class AboutPane extends JPanel { private static final String FINEREPORT = "FineReport"; private static final int DEFAULT_GAP = 12; @@ -49,13 +53,13 @@ public class AboutPane extends JPanel { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO_OK")); //center panel - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(centerPane, BorderLayout.CENTER); - JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); + JPanel contentPane = column().getComponent(); centerPane.add(contentPane, BorderLayout.NORTH); - contentPane.add(new BoxCenterAligmentPane(getBuildTitle())); + contentPane.add(new BoxCenterAligmentPane(getBuildTitle(), FineUIStyle.LABEL_BOLD)); BoxCenterAlignmentCopyablePane buildCopyPane = new BoxCenterAlignmentCopyablePane( StringUtils.EMPTY, getVersionBuildNO(), @@ -68,7 +72,8 @@ public class AboutPane extends JPanel { BoxCenterAligmentPane boxCenterAlignmentPane = new BoxCenterAligmentPane(getCopyRight()); contentPane.add(boxCenterAlignmentPane); - boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_All_Rights_Reserved")); + boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_All_Rights_Reserved"), + FineUIStyle.LABEL_BOLD); contentPane.add(boxCenterAlignmentPane); contentPane.add(new BoxCenterAlignmentCopyablePane( @@ -271,6 +276,11 @@ public class AboutPane extends JPanel { private UILabel textLabel; + public BoxCenterAligmentPane(String text, String style) { + this(text); + FineUIStyle.setStyle(textLabel, style); + } + public BoxCenterAligmentPane(String text) { this(new UILabel(text)); } @@ -325,7 +335,7 @@ public class AboutPane extends JPanel { }); this.lastLabel = new UILabel(descriptions[0]); - lastLabel.setForeground(Color.lightGray); + FineUIStyle.setStyle(lastLabel, FineUIStyle.LABEL_TIP); centerPane.add(lastLabel); add(centerPane, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java index faf0614533..b1fa48c458 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.help; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.i18n.Toolkit; import com.fr.design.login.AbstractDesignerSSO; @@ -32,7 +33,7 @@ public class TutorialAction extends AbstractDesignerSSO { this.setMenuKeySet(HELP_TUTORIAL); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/help"); + this.setSmallIcon(new LazyIcon("help")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java b/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java index 53ef796b34..4ba2a02926 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java @@ -1,13 +1,12 @@ package com.fr.design.actions.help; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; - import com.fr.start.ServerStarter; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -16,7 +15,7 @@ public class WebDemoAction extends UpdateAction { this.setMenuKeySet(PRODUCT_DEMO); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_help/demo"); + this.setSmallIcon(new LazyIcon("demo")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java index 3dc951578a..ef4754c6a1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java @@ -1,6 +1,6 @@ package com.fr.design.actions.help.alphafine; -import com.fr.base.svg.SVGIcon; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; @@ -21,7 +21,7 @@ public class AlphaFineAction extends UpdateAction { this.setMenuKeySet(ALPHAFINE); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("com/fr/design/mainframe/alphafine/images/smallsearch"); + this.setSmallIcon(new LazyIcon("search")); this.generateAndSetSearchText(AlphaFineConfigPane.class.getName()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java index dcc20f6ea7..e51997bdc6 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java @@ -1,5 +1,9 @@ package com.fr.design.actions.help.alphafine; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.FRContext; import com.fr.base.svg.IconUtils; import com.fr.design.DesignerEnvManager; @@ -37,6 +41,11 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * Created by XiaXiang on 2017/4/6. */ @@ -74,13 +83,14 @@ public class AlphaFineConfigPane extends BasicPane { } private void initComponents() { - JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - createOpenPane(contentPane); - createOnlinePane(contentPane); - createShortcutsPane(contentPane); - createSearchConfigPane(contentPane); this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.add(contentPane, BorderLayout.NORTH); + add(column( + 10, + cell(createOpenPane()), + cell(createOnlinePane()), + cell(createShortcutsPane()), + cell(createSearchConfigPane()) + ).getComponent()); } private Component[][] initOnlineComponents() { @@ -91,11 +101,7 @@ public class AlphaFineConfigPane extends BasicPane { } // 搜索范围 - private void createSearchConfigPane(JPanel contentPane) { - double[] rowSize = {ROW_HEIGHT, ROW_HEIGHT, ROW_HEIGHT}; - double[] columnSize = {COLUMN_WIDTH, COLUMN_WIDTH, COLUMN_WIDTH}; - - JPanel searchConfigWrapperPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range")); + private Component createSearchConfigPane() { // 搜索选项 productDynamicsCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Product_News")); containActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Function")); @@ -105,11 +111,9 @@ public class AlphaFineConfigPane extends BasicPane { containFileContentSearchCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content")); containTemplateShopCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Shop")); containMyTemplateCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_My_Templates")); - JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize); // 自定义排序 JPanel customSortWrapperPane = new JPanel(); - customSortWrapperPane.setPreferredSize(new Dimension(SEARCH_CONFIG_PANE_HEIGHT, SEARCH_CONFIG_PANE_WIDTH)); customSortWrapperPane.setAlignmentY(JPanel.TOP_ALIGNMENT); customSortLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Config_Custom_Sort"), false); customSortLabel.setForeground(UIConstants.NORMAL_BLUE); @@ -123,9 +127,11 @@ public class AlphaFineConfigPane extends BasicPane { customSortLabel.setEnabled(false); } - searchConfigWrapperPane.add(searchConfigPane); - searchConfigWrapperPane.add(customSortWrapperPane); - contentPane.add(searchConfigWrapperPane); + initSearchRangeComponents(); + return FineUIUtils.wrapComponentWithTitle(column(5, + row(cell(productDynamicsCheckbox).weight(0.25), cell(containTemplateShopCheckbox).weight(0.25), cell(containDocumentCheckbox).weight(0.25), cell(customSortWrapperPane).weight(0.25)), + row(cell(containPluginCheckbox).weight(0.25), cell(containActionCheckbox).weight(0.25), cell(containMyTemplatePane).weight(0.25), flex(0.25)) + ).getComponent(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range")); } /** @@ -139,15 +145,10 @@ public class AlphaFineConfigPane extends BasicPane { } - private Component[][] initSearchRangeComponents() { + private void initSearchRangeComponents() { // 我的模板checkbox设置，点击后 initMyTemplateSearchPane(); - Component[][] components = new Component[][]{ - new Component[]{productDynamicsCheckbox, containTemplateShopCheckbox, containDocumentCheckbox}, - new Component[]{containPluginCheckbox, containActionCheckbox, containMyTemplatePane}, - }; - // 添加选项点事件，无选中选项时自定排序按钮置灰 UICheckBox[] checkBoxes = new UICheckBox[]{productDynamicsCheckbox, containTemplateShopCheckbox, containDocumentCheckbox, containPluginCheckbox, containActionCheckbox, containMyTemplateCheckbox}; for (UICheckBox box : checkBoxes) { @@ -155,7 +156,6 @@ public class AlphaFineConfigPane extends BasicPane { customSortLabel.setEnabled(hasSelectedSearchRangeCheckBox()); }); } - return components; } /** @@ -184,7 +184,7 @@ public class AlphaFineConfigPane extends BasicPane { * 搜索范围-我的模板 */ private void initMyTemplateSearchPane() { - containMyTemplatePane = new JPanel(new FlowLayout(FlowLayout.LEFT, 4, 5)); + containMyTemplatePane = new JPanel(new BorderLayout(4, 5)); containMyTemplateCheckbox.setBorder(BorderFactory.createEmptyBorder()); containMyTemplateCheckbox.addActionListener(new ActionListener() { @Override @@ -199,7 +199,7 @@ public class AlphaFineConfigPane extends BasicPane { myTemplateSearchConfigButton = new JButton(); myTemplateSearchConfigButton.setBorder(BorderFactory.createEmptyBorder()); myTemplateSearchConfigButton.setMargin(new Insets(0, 0, 0, 0)); - myTemplateSearchConfigButton.setIcon(IconUtils.readIcon("/com/fr/design/mainframe/alphafine/images/config.svg")); + myTemplateSearchConfigButton.setIcon(new LazyIcon("tool_config")); myTemplateSearchMenu = new UIPopupMenu(); containTemplateNameSearchCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_AlphaFine_Config_Name_Search")); containFileContentSearchCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_AlphaFine_Config_Content_Search")); @@ -209,11 +209,13 @@ public class AlphaFineConfigPane extends BasicPane { containFileContentSearchCheckbox.setBackground(null); myTemplateSearchMenu.add(containTemplateNameSearchCheckbox); myTemplateSearchMenu.add(containFileContentSearchCheckbox); + containTemplateNameSearchCheckbox.setBorder(new ScaledEmptyBorder(0, 5, 0, 5)); + containFileContentSearchCheckbox.setBorder(new ScaledEmptyBorder(0, 5, 0, 5)); myTemplateSearchConfigButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { super.mouseClicked(e); - GUICoreUtils.showPopupMenu(myTemplateSearchMenu, containMyTemplatePane, containMyTemplateCheckbox.getWidth(), containMyTemplatePane.getY()); + GUICoreUtils.showPopupMenu(myTemplateSearchMenu, containMyTemplatePane, containMyTemplateCheckbox.getWidth(), containMyTemplatePane.getHeight()); } @Override @@ -222,24 +224,22 @@ public class AlphaFineConfigPane extends BasicPane { myTemplateSearchMenu.setVisible(false); } }); - containMyTemplatePane.add("containMyTemplateCheckbox", containMyTemplateCheckbox); - containMyTemplatePane.add("myTemplateSearchConfigButton", myTemplateSearchConfigButton); + FineUIStyle.setStyle(myTemplateSearchConfigButton, FineUIStyle.PLAIN_BUTTON); + containMyTemplatePane.add(row(2, cell(containMyTemplateCheckbox), cell(myTemplateSearchConfigButton)).getComponent()); } - private void createShortcutsPane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Shortcut_Config")); + private Component createShortcutsPane() { shortcutsField = new UITextField(); shortcutsField.setEditable(false); shortcutsField.selectAll(); - shortcutsField.setPreferredSize(new Dimension(100, 20)); initFieldListener(); - northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open") + ":")); - northPane.add(shortcutsField); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts")); label.setForeground(LABEL_TEXT); - northPane.add(label); - contentPane.add(northPane); + return FineUIUtils.wrapComponentWithTitle( + row(10, cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open") + ":")), + cell(shortcutsField), cell(label) + ).getComponent(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Shortcut_Config")); } private void initFieldListener() { @@ -265,8 +265,7 @@ public class AlphaFineConfigPane extends BasicPane { }); } - private void createOnlinePane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Type")); + private Component createOnlinePane() { searchOnlineCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_Internet_Search")); needSegmentationCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_Segmentation")); searchOnlineCheckbox.addActionListener(new ActionListener() { @@ -292,15 +291,12 @@ public class AlphaFineConfigPane extends BasicPane { double[] rowSize = {ROW_HEIGHT}; double[] columnSize = {COLUMN_WIDTH, COLUMN_WIDTH, COLUMN_WIDTH}; JPanel onlinePane = TableLayoutHelper.createTableLayoutPane(initOnlineComponents(), rowSize, columnSize); - northPane.add(onlinePane); - contentPane.add(northPane); + return FineUIUtils.wrapComponentWithTitle(onlinePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Type")); } - private void createOpenPane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable")); + private Component createOpenPane() { enabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_AlphaFine")); - northPane.add(enabledCheckbox); - contentPane.add(northPane); + return FineUIUtils.wrapComponentWithTitle(enabledCheckbox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java index 9e2af09379..418cee96dd 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java @@ -1,6 +1,6 @@ package com.fr.design.actions.help.alphafine.component; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.help.alphafine.AlphaFineConfigPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; @@ -74,14 +74,10 @@ public class CustomSortPane extends JPanel { } private void createToolbarPane() { - top = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top.svg"), false); - bottom = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom.svg"), false); - up = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up.svg"), false); - down = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down.svg"), false); - top.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top_disable.svg")); - bottom.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom_disable.svg")); - up.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up_disable.svg")); - down.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down_disable.svg")); + top = new UIButton(new LazyIcon("to_top")); + bottom = new UIButton(new LazyIcon("to_bottom")); + up = new UIButton(new LazyIcon("move_up")); + down = new UIButton(new LazyIcon("move_down")); top.addActionListener(e -> { SwingUtilities.invokeLater(() -> { sortItemPane.setComponentZOrder(selectedLabel, 0); diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java index 3f09eadac4..c7df262927 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java @@ -1,5 +1,7 @@ package com.fr.design.actions.server; +import com.fine.theme.icon.LazyIcon; +import com.fr.data.impl.Connection; import com.fr.design.actions.UpdateAction; import com.fr.design.data.datapane.connect.DatabaseConnectionPane; import com.fr.design.editlock.ConnectionLockChangeChecker; @@ -7,10 +9,10 @@ import com.fr.design.editlock.EditLockUtils; import com.fr.design.gui.imenu.UILockMenuItem; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.menu.MenuKeySet; -import com.fr.stable.os.support.OSBasedAction; -import com.fr.stable.os.support.OSSupportCenter; import com.fr.design.os.impl.DatabaseDialogAction; import com.fr.report.LockItem; +import com.fr.stable.os.support.OSBasedAction; +import com.fr.stable.os.support.OSSupportCenter; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -24,7 +26,7 @@ public class ConnectionListAction extends UpdateAction { this.setMenuKeySet(DEFINE_DATA_CONNECTION); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_web/connection"); + this.setSmallIcon(new LazyIcon("connection")); this.generateAndSetSearchText(DatabaseConnectionPane.JDBC.class.getName()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java index c31ff61525..881935b871 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java @@ -4,7 +4,7 @@ package com.fr.design.actions.server; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.config.Configuration; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; @@ -13,11 +13,10 @@ import com.fr.design.formula.FunctionManagerPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.MenuKeySet; import com.fr.file.FunctionConfig; - import com.fr.transaction.Configurations; import com.fr.transaction.Worker; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -29,7 +28,7 @@ public class FunctionManagerAction extends UpdateAction { this.setMenuKeySet(FUNCTION_MANAGER); this.setName(getMenuKeySet().getMenuKeySetName()+"..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_web/function"); + this.setSmallIcon(new LazyIcon("functionManager")); this.generateAndSetSearchText(FunctionManagerPane.class.getName()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java index d3f035972c..d713b71ea3 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java @@ -3,8 +3,8 @@ */ package com.fr.design.actions.server; +import com.fine.theme.icon.LazyIcon; import com.fr.base.ParameterConfig; -import com.fr.base.svg.IconUtils; import com.fr.config.ServerPreferenceConfig; import com.fr.design.DesignModelAdapter; import com.fr.design.actions.UpdateAction; @@ -14,7 +14,6 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; import com.fr.design.parameter.ParameterManagerPane; - import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; @@ -31,7 +30,7 @@ public class GlobalParameterAction extends UpdateAction { this.setMenuKeySet(GLOBAL_PARAMETER); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_report/p"); + this.setSmallIcon(new LazyIcon("reportParameter")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java index d32e4b1bfc..3778e49d7c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.server; +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; import com.fr.data.impl.Connection; import com.fr.decision.webservice.bean.dataset.ServerDataSetBean; @@ -23,6 +24,7 @@ import com.fr.esd.event.DSMapping; import com.fr.esd.event.DsNameTarget; import com.fr.esd.event.StrategyEventsNotifier; +import com.fr.file.TableDataConfig; import com.fr.report.LockItem; import com.fr.security.encryption.transmission.TransmissionEncryptionManager; import com.fr.workspace.server.entity.connection.ConnectionBean; @@ -47,7 +49,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS this.setMenuKeySet(SERVER_TABLEDATA); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/data/dock/serverdatabase"); + this.setSmallIcon(new LazyIcon("monochromeServerDatabase")); } public static final MenuKeySet SERVER_TABLEDATA = new MenuKeySet() { diff --git a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java index f62327ad9a..18a73cbbe9 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java @@ -1,12 +1,11 @@ package com.fr.design.actions.server; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.design.utils.DesignUtils; - -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; public class PlatformManagerAction extends UpdateAction { @@ -14,7 +13,7 @@ public class PlatformManagerAction extends UpdateAction { this.setMenuKeySet(PLATEFORM_MANAGER); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/server/platform_16_16"); + this.setSmallIcon(new LazyIcon("platform")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java index bb9339568c..1f3f0d6045 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java @@ -1,13 +1,13 @@ package com.fr.design.actions.server; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.design.os.impl.PMDialogAction; import com.fr.stable.os.support.OSBasedAction; import com.fr.stable.os.support.OSSupportCenter; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; /** @@ -20,7 +20,7 @@ public class PluginManagerAction extends UpdateAction { this.setMenuKeySet(PLUGIN_MANAGER); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/server/plugin"); + this.setSmallIcon(new LazyIcon("pluginManager")); } @Override public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java index 905e84e253..6650240017 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java @@ -1,6 +1,6 @@ package com.fr.design.actions.server; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignModelAdapter; import com.fr.design.actions.UpdateAction; import com.fr.design.data.DesignTableDataManager; @@ -11,7 +11,6 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.file.ProcedureConfig; - import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; @@ -22,7 +21,7 @@ public class ProcedureListAction extends UpdateAction { public ProcedureListAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure") + "(P)" + "..."); this.setMnemonic('P'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png")); + this.setSmallIcon(new LazyIcon("store_procedure")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/template/NewWorkBookToolButtonAction.java b/designer-base/src/main/java/com/fr/design/actions/template/NewWorkBookToolButtonAction.java new file mode 100644 index 0000000000..15d7eaf9d1 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/actions/template/NewWorkBookToolButtonAction.java @@ -0,0 +1,31 @@ +package com.fr.design.actions.template; + +import com.fine.theme.icon.LazyIcon; +import com.fr.design.actions.UpdateAction; +import com.fr.design.mainframe.DesignerContext; + +import javax.swing.Icon; +import java.awt.event.ActionEvent; + +/** + * 工具按钮 - 新建报表文件 + * + * @author lemon + * @since + * Created on + */ +public class NewWorkBookToolButtonAction extends UpdateAction { + public NewWorkBookToolButtonAction() { + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_WorkBook")); + this.setSmallIcon(icon()); + } + + protected Icon icon() { + return new LazyIcon("add_worksheet"); + } + + @Override + public void actionPerformed(ActionEvent e) { + DesignerContext.getDesignerFrame().addAndActivateJTemplate(); + } +} diff --git a/designer-base/src/main/java/com/fr/design/border/FineBorderFactory.java b/designer-base/src/main/java/com/fr/design/border/FineBorderFactory.java new file mode 100644 index 0000000000..422e002f33 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/border/FineBorderFactory.java @@ -0,0 +1,79 @@ +package com.fr.design.border; + +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; + +import javax.swing.BorderFactory; +import javax.swing.border.Border; +import java.awt.Color; + +/** + * 创建Border的工厂 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/01/08 + */ +public class FineBorderFactory { + + /** + * 创建一个下划线边框 + * + * @param color 下划线颜色 + * @return 边框 + */ + public static Border createUnderlineBorder(Color color) { + return BorderFactory.createMatteBorder(0, 0, 1, 0, color); + } + + /** + * 创建默认的下划线边框 + * + * @return 边框 + */ + public static Border createDefaultUnderlineBorder() { + return createUnderlineBorder(FineUIUtils.getUIColor("Label.borderColor", "defaultBorderColor")); + } + + /** + * 创建一个上边缘线边框 + * + * @param color 上边缘线颜色 + * @return 边框 + */ + public static Border createToplineBorder(Color color) { + return BorderFactory.createMatteBorder(1, 0, 0, 0, color); + } + + /** + * 创建默认的上划线边框 + * + * @return 边框 + */ + public static Border createDefaultTopBorder() { + return createToplineBorder(FineUIUtils.getUIColor("Label.borderColor", "defaultBorderColor")); + } + + /** + * 创建包装的圆角边框，无论内部组件是否圆角，可确保外部为圆角边框 + * + * @return 边框 + */ + public static Border createWrappedRoundBorder() { + return BorderFactory.createCompoundBorder( + new UIRoundedBorder(FlatUIUtils.getUIColor("defaultBorderColor", Color.GRAY), 1, + FlatUIUtils.getUIInt("Component.arc", 5)), + new ScaledEmptyBorder(1, 1, 1, 1) + ); + } + + /** + * 创建具有padding的边框 + * @return 边框 + */ + public static Border createBorderWithPadding(Border border) { + return BorderFactory.createCompoundBorder(border, new ScaledEmptyBorder(0, 6, 0, 0) + ); + } +} diff --git a/designer-base/src/main/java/com/fr/design/carton/CartonConstants.java b/designer-base/src/main/java/com/fr/design/carton/CartonConstants.java new file mode 100644 index 0000000000..c51f1193c5 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/carton/CartonConstants.java @@ -0,0 +1,61 @@ +package com.fr.design.carton; + +import com.fr.stable.ProductConstantsBase; +import com.fr.stable.StableUtils; + +import java.text.SimpleDateFormat; + +/** + * 卡顿常量类管理 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/07/04 + */ +public class CartonConstants { + + public static final String TIME = "time"; + public static final String APPID = "appId"; + public static final String USERID = "userId"; + public static final String LOCAL = "local"; + public static final String REMOTE = "remote"; + public static final String OPERANDS_NUM = "operands"; + public static final String DESIGN_METHOD = "designMethod"; + public static final String DESIGNER_VERSION = "designerVersion"; + public static final String DESIGNER_ID = "designerId"; + + public static final String EASY_CHECKER_FILE_NAME = "easy_check_log.csv"; + public static final String TIMER_CHECKER_FILE_NAME = "timer_check_log.csv"; + + /** + * 开启间隔检测后两次检测的相隔时间ms + */ + public static final long CHECK_INTERVAL_MS = 100; + + /** + * 最大的事件允许执行时间，超过该时间则打印堆栈等相关信息 + */ + public static final long UNREASONABLE_DISPATCH_DURATION_MS = 1500; + + /** + * UI检测采样频率 + */ + public static final int LATENCY_SAMPLING_FREQUENCY = 100; + + /** + * 输出日志所在地址 + */ + public static final String JOURNAL_FILE_PATH = StableUtils.pathJoin(ProductConstantsBase.getEnvHome(), "journal_log"); + + /** + * 日期事件格式 + */ + public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + /** + * Designer4Debug类名 + */ + public static final String DEBUG_MAIN_CLASS_NAME = "com.fr.start.Designer4Debug"; + + +} diff --git a/designer-base/src/main/java/com/fr/design/carton/CartonThreadExecutorPool.java b/designer-base/src/main/java/com/fr/design/carton/CartonThreadExecutorPool.java index 39525110b3..d366791b25 100644 --- a/designer-base/src/main/java/com/fr/design/carton/CartonThreadExecutorPool.java +++ b/designer-base/src/main/java/com/fr/design/carton/CartonThreadExecutorPool.java @@ -57,18 +57,18 @@ public class CartonThreadExecutorPool extends ThreadPoolExecutor { private void examineHang() { StackTraceElement[] currentStack = eventThread.getStackTrace(); - if (lastReportedStack!=null && EventDispatchThreadHangMonitor.stacksEqual(currentStack, lastReportedStack)) { + if (lastReportedStack!=null && CartonUtils.stacksEqual(currentStack, lastReportedStack)) { return; } lastReportedStack = currentStack; - String stackTrace = EventDispatchThreadHangMonitor.stackTraceToString(currentStack); + String stackTrace = CartonUtils.stackTraceToString(currentStack); JSONObject jsonObject = new JSONObject(); jsonObject.put(Toolkit.i18nText("Fine-Design_Basic_Carton_Output_Time"), simpleDateFormatThreadSafe.format(System.currentTimeMillis())); jsonObject.put(Toolkit.i18nText("Fine-Design_Basic_Carton_Event_Number"), "swingWorker_" + hangNumber); jsonObject.put(Toolkit.i18nText("Fine-Design_Basic_Carton_Duration_Task_Execute"), timeSoFar() + "ms"); jsonObject.put(Toolkit.i18nText("Fine-Design_Basic_Carton_Stack_Info"), stackTrace); - EventDispatchThreadHangMonitor.outPutJournalLog(jsonObject.toString(), SwitchForSwingChecker.TIMER_CHECK_FLAG); - EventDispatchThreadHangMonitor.checkForDeadlock(); + CartonUtils.outPutJournalLog(jsonObject.toString(), SwitchForSwingChecker.TIMER_CHECK_FLAG); + CartonUtils.checkForDeadlock(); } } @@ -129,7 +129,7 @@ public class CartonThreadExecutorPool extends ThreadPoolExecutor { jsonObject.put(Toolkit.i18nText("Fine-Design_Basic_Carton_Event_Number"), "swingWorker_" + concurrentHashMap.get(currentThreadId).hangNumber); jsonObject.put(Toolkit.i18nText("Fine-Design_Basic_Carton_Task_Start_Time"), simpleDateFormatThreadSafe.format(concurrentHashMap.get(currentThreadId).startTime)); jsonObject.put(Toolkit.i18nText("Fine-Design_Basic_Carton_Task_Total_Time"), runTime + "ms"); - EventDispatchThreadHangMonitor.outPutJournalLog(jsonObject.toString(), SwitchForSwingChecker.EASY_CHECK_FLAG); + CartonUtils.outPutJournalLog(jsonObject.toString(), SwitchForSwingChecker.EASY_CHECK_FLAG); } concurrentHashMap.remove(currentThreadId); diff --git a/designer-base/src/main/java/com/fr/design/carton/CartonUtils.java b/designer-base/src/main/java/com/fr/design/carton/CartonUtils.java new file mode 100644 index 0000000000..df8361662b --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/carton/CartonUtils.java @@ -0,0 +1,147 @@ +package com.fr.design.carton; + +import com.fr.log.FineLoggerFactory; +import com.fr.stable.ArrayUtils; +import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; +import org.jetbrains.annotations.NotNull; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.lang.management.ThreadInfo; +import java.lang.management.ThreadMXBean; +import java.text.SimpleDateFormat; + +import static com.fr.design.carton.CartonConstants.EASY_CHECKER_FILE_NAME; +import static com.fr.design.carton.CartonConstants.JOURNAL_FILE_PATH; +import static com.fr.design.carton.CartonConstants.TIMER_CHECKER_FILE_NAME; + +/** + * 设计器卡顿业务工具类 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/07/10 + */ +public class CartonUtils { + + /** + * 堆栈元素输出为文本 + * + * @param stackTrace 堆栈元素 + * @return 文本 + */ + public static String stackTraceToString(StackTraceElement[] stackTrace) { + StringBuilder result = new StringBuilder(); + for (StackTraceElement stackTraceElement : stackTrace) { + String indentation = " "; + result.append("~").append(indentation).append(stackTraceElement); + } + return result.toString(); + } + + /** + * 命令行显示堆栈信息 + * + * @param stackTrace 堆栈元素 + * @return 文本 + */ + public static String stackTraceToStringForConsole(StackTraceElement[] stackTrace) { + StringBuilder result = new StringBuilder(); + for (StackTraceElement stackTraceElement : stackTrace) { + String indentation = " "; + result.append("\r\n").append(indentation).append(stackTraceElement); + } + return result.toString(); + } + + /** + * 堆栈是否一致 + * + * @param a 堆栈A + * @param b 堆栈B + * @return 是否一致 + */ + public static boolean stacksEqual(@NotNull StackTraceElement[] a, @NotNull StackTraceElement[] b) { + if (!ArrayUtils.isSameLength(a, b)) { + return false; + } + for (int i = 0; i < a.length; ++i) { + if (!a[i].equals(b[i])) { + return false; + } + } + return true; + } + + /** + * 检查死锁 + */ + public static void checkForDeadlock() { + ThreadMXBean threadBean = ManagementFactory.getThreadMXBean(); + long[] threadIds = threadBean.findDeadlockedThreads(); + if (threadIds == null) { + return; + } + FineLoggerFactory.getLogger().warn("deadlock detected involving the following threads:"); + ThreadInfo[] threadInfos = threadBean.getThreadInfo(threadIds, Integer.MAX_VALUE); + for (ThreadInfo info : threadInfos) { + FineLoggerFactory.getLogger().warn("Thread # {} {} ( {} ) waiting on {} held by {} {}", info.getThreadId(), info.getThreadName(), + info.getThreadState(), info.getLockName(), info.getLockOwnerName(), CartonUtils.stackTraceToStringForConsole(info.getStackTrace())); + } + } + + /** + * 输出卡顿日志 + * + * @param message 文本信息 + * @param flag 类型，true时为简单检查、false时为定时检查 + */ + public static void outPutJournalLog(String message, int flag) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String date = simpleDateFormat.format(System.currentTimeMillis()); + String filename = flag == SwitchForSwingChecker.EASY_CHECK_FLAG ? EASY_CHECKER_FILE_NAME : TIMER_CHECKER_FILE_NAME; + String[] split = date.split("-"); + int month = StringUtils.isEmpty(split[1]) ? -1 : Integer.parseInt(split[1]); + String dirPath = StableUtils.pathJoin(JOURNAL_FILE_PATH, split[0], "month-" + month, date); + File dirFile = new File(dirPath); + File file = new File(StableUtils.pathJoin(dirPath, filename)); + try { + if (!file.exists()) { + if (!dirFile.exists()) { + dirFile.mkdirs(); + } + file.createNewFile(); + } + try (BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file, true))) { + String outputMessage = message.replaceAll("~", "\r\n") + "," + "\r\n"; + bufferedWriter.write(outputMessage); + } + } catch (IOException e) { + FineLoggerFactory.getLogger().error("output fail", e); + } + } + + /** + * 用于判断是不是特定的堆栈 + */ + public static boolean stackTraceElementIs(StackTraceElement e, String className, String methodName, boolean isNative) { + return e.getClassName().equals(className) && e.getMethodName().equals(methodName) && e.isNativeMethod() == isNative; + } + + /** + * 用于判断某个堆栈是否在等待另一个事件 + * 取当前堆栈前三层判断是是不是匹配等待堆栈的格式 + */ + public static boolean isWaitingForNextEvent(StackTraceElement[] currentStack) { + + return currentStack != null && currentStack.length >= 3 && + stackTraceElementIs(currentStack[0], "java.lang.Object", "wait", true) + && stackTraceElementIs(currentStack[1], "java.lang.Object", "wait", false) + && stackTraceElementIs(currentStack[2], "java.awt.EventQueue", "getNextEvent", false); + } + +} diff --git a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java index 70a290ecb1..6fa29f41ce 100644 --- a/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java +++ b/designer-base/src/main/java/com/fr/design/carton/EventDispatchThreadHangMonitor.java @@ -2,6 +2,7 @@ package com.fr.design.carton; import com.fanruan.product.ProductConstantsBase; import com.fr.concurrent.FineExecutors; +import com.fr.design.carton.latency.DesignerLatencyMetric; import com.fr.design.ui.util.UIUtil; import com.fr.json.JSONObject; import com.fr.log.FineLoggerFactory; @@ -16,20 +17,17 @@ import java.awt.EventQueue; import java.awt.Toolkit; import java.awt.AWTEvent; import java.awt.event.WindowEvent; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.management.ManagementFactory; -import java.lang.management.ThreadInfo; -import java.lang.management.ThreadMXBean; -import java.text.SimpleDateFormat; import java.util.LinkedList; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import static com.fr.design.carton.CartonConstants.CHECK_INTERVAL_MS; +import static com.fr.design.carton.CartonConstants.DATE_FORMAT; +import static com.fr.design.carton.CartonConstants.LATENCY_SAMPLING_FREQUENCY; +import static com.fr.design.carton.CartonConstants.UNREASONABLE_DISPATCH_DURATION_MS; + /** * 参考自git swinghelper * 用于卡顿检测 @@ -39,31 +37,16 @@ import java.util.concurrent.TimeUnit; */ public final class EventDispatchThreadHangMonitor extends EventQueue { - /** - * 日期事件格式 - */ - private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static final EventDispatchThreadHangMonitor INSTANCE = new EventDispatchThreadHangMonitor(); /** * 一个timer */ private Timer timer; - /** - * 开启间隔检测后两次检测的相隔时间ms - */ - private static final long CHECK_INTERVAL_MS = 100; - /** - * 最大的事件允许执行时间，超过该时间则打印堆栈等相关信息 - */ - private static final long UNREASONABLE_DISPATCH_DURATION_MS = 1500; /** * 事件唯一编码，用于方便日志的查看 */ - private static long hangCount = 0; - /** - * 输出日志所在地址 - */ - private static final String JOURNAL_FILE_PATH = StableUtils.pathJoin(ProductConstantsBase.getEnvHome(), "journal_log"); + private static long hangCount = 0; /** * 类似于一个开关，当该值为默认的false启动时，定时任务在窗口开启前都不会对执行的事件进行检查 */ @@ -104,43 +87,6 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { return hangCount++; } - /** - * @param a can not be null - * @param b can not be null - * @return - */ - public static boolean stacksEqual(@NotNull StackTraceElement[] a, @NotNull StackTraceElement[] b) { - - if (!ArrayUtils.isSameLength(a, b)) { - return false; - } - for (int i = 0; i < a.length; ++i) { - if (!a[i].equals(b[i])) { - return false; - } - } - return true; - } - - /** - * 用于判断是不是特定的堆栈 - */ - public static boolean stackTraceElementIs(StackTraceElement e, String className, String methodName, boolean isNative) { - return e.getClassName().equals(className) && e.getMethodName().equals(methodName) && e.isNativeMethod() == isNative; - } - - /** - * 用于判断某个堆栈是否在等待另一个事件 - * 取当前堆栈前三层判断是是不是匹配等待堆栈的格式 - */ - public static boolean isWaitingForNextEvent(StackTraceElement[] currentStack) { - - return currentStack != null && currentStack.length >= 3 && - stackTraceElementIs(currentStack[0], "java.lang.Object", "wait", true) - && stackTraceElementIs(currentStack[1], "java.lang.Object", "wait", false) - && stackTraceElementIs(currentStack[2], "java.awt.EventQueue", "getNextEvent", false); - } - /** * event事件的包装类 */ @@ -154,11 +100,13 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { //事件开始的时间 private final long startDispatchTimeMillis = System.currentTimeMillis(); //事件编号 - private long hangNumber; + private final long hangNumber; + //构造函数，给当前对象赋一个递增的唯一编号 - public DispatchInfo() { + public DispatchInfo() { hangNumber = getHangCount(); } + //定时调度任务检测的入口，如果执行时间大于设定的值就进入examineHang（）方法 public void checkForHang() { if (timeSoFar() > UNREASONABLE_DISPATCH_DURATION_MS) { @@ -169,36 +117,38 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { private void examineHang() { //获取执行线程的当前堆栈 StackTraceElement[] currentStack = eventDispatchThread.getStackTrace(); - if (isWaitingForNextEvent(currentStack)) { + if (CartonUtils.isWaitingForNextEvent(currentStack)) { return; } //某个事件执行时间很长，定时处理时可能会连续打很多个堆栈，对同一个事件的相同堆栈只打一次 - if (lastReportedStack !=null && stacksEqual(lastReportedStack, currentStack)) { + if (lastReportedStack != null && CartonUtils.stacksEqual(lastReportedStack, currentStack)) { return; } - String stackTrace = stackTraceToString(currentStack); + String stackTrace = CartonUtils.stackTraceToString(currentStack); lastReportedStack = currentStack; JSONObject jsonObject = new JSONObject(); - jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Output_Time"), simpleDateFormat.format(System.currentTimeMillis())); + jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Output_Time"), DATE_FORMAT.format(System.currentTimeMillis())); jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Event_Number"), "eventQueue_" + hangNumber); jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Duration_Task_Execute"), timeSoFar() + "ms"); jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Stack_Info"), stackTrace); - outPutJournalLog(jsonObject.toString(), SwitchForSwingChecker.TIMER_CHECK_FLAG); - checkForDeadlock(); + CartonUtils.outPutJournalLog(jsonObject.toString(), SwitchForSwingChecker.TIMER_CHECK_FLAG); + CartonUtils.checkForDeadlock(); } + //记录连续运行了多长时间 - private long timeSoFar() { + public long timeSoFar() { return (System.currentTimeMillis() - lastDispatchTimeMillis); } + //记录一个事件从被分发到结束的总运行时间 - private long totalTime() { + public long totalTime() { return (System.currentTimeMillis() - startDispatchTimeMillis); } //事件处理完后的时间判断 public void dispose() { if (timeSoFar() > UNREASONABLE_DISPATCH_DURATION_MS) { exportCartonLog(true); - } else if (lastReportedStack != null){ + } else if (lastReportedStack != null) { exportCartonLog(false); } } @@ -209,40 +159,15 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { */ private void exportCartonLog(boolean flag) { JSONObject jsonObject = new JSONObject(); - jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Output_Time"), simpleDateFormat.format(System.currentTimeMillis())); + jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Output_Time"), DATE_FORMAT.format(System.currentTimeMillis())); jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Event_Number"), "eventQueue_" + hangNumber); - jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Task_Start_Time"), simpleDateFormat.format(startDispatchTimeMillis)); + jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Task_Start_Time"), DATE_FORMAT.format(startDispatchTimeMillis)); if (flag) { jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Task_Total_Time"), timeSoFar() + "ms"); } else { jsonObject.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Carton_Task_Total_Time"), totalTime() + "ms"); } - outPutJournalLog(jsonObject.toString(), SwitchForSwingChecker.EASY_CHECK_FLAG); - } - } - - public static void outPutJournalLog(String message, int flag) { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - String date = simpleDateFormat.format(System.currentTimeMillis()); - String filename = flag == SwitchForSwingChecker.EASY_CHECK_FLAG ? SwitchForSwingChecker.EASY_CHECKER_FILE_NAME: SwitchForSwingChecker.TIMER_CHECKER_FILE_NAME; - String[] split = date.split("-"); - int month = StringUtils.isEmpty(split[1]) ? -1 : Integer.parseInt(split[1]); - String dirPath = StableUtils.pathJoin(JOURNAL_FILE_PATH, split[0], "month-" + month, date); - File dirFile = new File(dirPath); - File file = new File( StableUtils.pathJoin(dirPath, filename)); - try { - if (!file.exists()) { - if (!dirFile.exists()) { - dirFile.mkdirs(); - } - file.createNewFile(); - } - BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(file, true)); - String outputMessage = new StringBuilder(message.replaceAll("~", "\r\n")).append(",").append("\r\n").toString(); - bufferedWriter.write(outputMessage); - bufferedWriter.close(); - } catch (IOException e) { - FineLoggerFactory.getLogger().error("output fail", e); + CartonUtils.outPutJournalLog(jsonObject.toString(), SwitchForSwingChecker.EASY_CHECK_FLAG); } } @@ -326,8 +251,7 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { */ @Override protected void dispatchEvent(AWTEvent event) { - //如果两个开关都没开，那就不走重写方法了 - if (!isEasyWitch() && !isTimerWitch()) { + if (!useCustomEventQueue()) { super.dispatchEvent(event); } else { try { @@ -343,6 +267,18 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { } } + private boolean useCustomEventQueue() { + // 开启性能监控或开启卡顿工具箱，则走自定义的EventQueue + return SwitchForSwingChecker.isLatencyMonitoring() || + isEasyWitch() || isTimerWitch(); + } + + private boolean needSampling() { + // UI性能采样逻辑：开启采样并且符合采样频次 + return SwitchForSwingChecker.isLatencyMonitoring() + && (hangCount % LATENCY_SAMPLING_FREQUENCY == 0); + } + /** * Starts tracking a dispatch. */ @@ -358,6 +294,9 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { private synchronized void postDispatchEvent() { synchronized (dispatches) { DispatchInfo justFinishedDispatch = dispatches.removeLast(); + if (needSampling()) { + DesignerLatencyMetric.getInstance().record(justFinishedDispatch.timeSoFar()); + } if (isEasyWitch()) { justFinishedDispatch.dispose(); } @@ -371,39 +310,4 @@ public final class EventDispatchThreadHangMonitor extends EventQueue { } } - /** - * 检查死锁 - */ - public static void checkForDeadlock() { - ThreadMXBean threadBean = ManagementFactory.getThreadMXBean(); - long[] threadIds = threadBean.findDeadlockedThreads(); - if (threadIds == null) { - return; - } - FineLoggerFactory.getLogger().warn("deadlock detected involving the following threads:"); - ThreadInfo[] threadInfos = threadBean.getThreadInfo(threadIds, Integer.MAX_VALUE); - for (ThreadInfo info : threadInfos) { - FineLoggerFactory.getLogger().warn("Thread # {} {} ( {} ) waiting on {} held by {} {}", info.getThreadId(), info.getThreadName(), - info.getThreadState(), info.getLockName(), info.getLockOwnerName(), stackTraceToStringForConsole(info.getStackTrace())); - } - } - - public static String stackTraceToString(StackTraceElement[] stackTrace) { - StringBuilder result = new StringBuilder(); - for (StackTraceElement stackTraceElement : stackTrace) { - String indentation = " "; - result.append("~").append(indentation).append(stackTraceElement); - } - return result.toString(); - } - - public static String stackTraceToStringForConsole(StackTraceElement[] stackTrace) { - StringBuilder result = new StringBuilder(); - for (StackTraceElement stackTraceElement : stackTrace) { - String indentation = " "; - result.append("\r\n").append(indentation).append(stackTraceElement); - } - return result.toString(); - } - } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java b/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java index fb801e7e53..308627a843 100644 --- a/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java +++ b/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java @@ -1,5 +1,9 @@ package com.fr.design.carton; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.decision.webservice.v10.log.download.utils.LogZipUtils; import com.fr.design.DesignerEnvManager; import com.fr.design.constants.UIConstants; import com.fr.design.dialog.FineJOptionPane; @@ -48,8 +52,11 @@ import java.text.ParseException; import java.util.List; import java.util.Objects; +import static com.fr.design.carton.CartonConstants.JOURNAL_FILE_PATH; + public class FeedbackToolboxDialog extends JDialog { + private static final int HORIZONTAL_GAP = 8; private UIDatePicker uiDatePicker; private JPanel generalSettingPanel = null; private UICheckBox easyCheckerButton = null; @@ -67,6 +74,7 @@ public class FeedbackToolboxDialog extends JDialog { setResizable(false); this.setLayout(FRGUIPaneFactory.createBorderLayout()); createBodyPanel(); + body.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); add(body); setSize(body.getPreferredSize()); setSwitches(!StringUtils.isEmpty(GeneralUtils.objectToString(uiDatePicker.getSelectedItem()))); @@ -86,14 +94,14 @@ public class FeedbackToolboxDialog extends JDialog { body.add(midPane, BorderLayout.CENTER); midPane.add(infoPane, BorderLayout.NORTH); Dimension dimension = new Dimension(662, 556); - body.setPreferredSize(dimension); + body.setPreferredSize(FineUIScale.scale(dimension)); this.body = body; } private JPanel createInfoPane() { - JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 10); + JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 0, 0); UILabel title = new UILabel(); - title.setText(" " + Toolkit.i18nText("Fine-Design_Basic_Carton_Record_Lag_Time") + ": "); + title.setText(Toolkit.i18nText("Fine-Design_Basic_Carton_Record_Lag_Time") + ": "); //判断一下当天是否有卡顿日志记录，如果有将日期设置为当天，如果没有设置为空 boolean cartonExists = SwitchForSwingChecker.isCartonExists(); if (cartonExists) { @@ -101,8 +109,8 @@ public class FeedbackToolboxDialog extends JDialog { } else { this.uiDatePicker = new UIDatePicker(UIDatePicker.STYLE_CN_DATE1, null, this); } - Dimension dimension = new Dimension(160, 100); - uiDatePicker.setPreferredSize(dimension); + Dimension dimension = new Dimension(100, 100); + uiDatePicker.setPreferredSize(FineUIScale.scale(dimension)); northPane.add(GUICoreUtils.createFlowPane(new Component[]{title, uiDatePicker}, FlowLayout.LEFT)); exportLogLabel = new UILabel(); exportLogLabel.setText(Toolkit.i18nText("Fine-Design_Basic_Carton_Export_Carton_Log")); @@ -146,7 +154,7 @@ public class FeedbackToolboxDialog extends JDialog { //selectDate 2002-03-09例子 String[] split = selectDate.split("-"); int month = Integer.parseInt(split[1]); - String sourceFilePath = StableUtils.pathJoin(SwitchForSwingChecker.JOURNAL_FILE_PATH, split[0], "month-" + month, selectDate); + String sourceFilePath = StableUtils.pathJoin(JOURNAL_FILE_PATH, split[0], "month-" + month, selectDate); File sourceFile = new File(sourceFilePath); if (sourceFile.exists()) { exportCartonLog(sourceFile, path, sourceFilePath); @@ -158,8 +166,7 @@ public class FeedbackToolboxDialog extends JDialog { private JPanel createTailPane() { JPanel tailPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); tailPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, lineColor)); - JPanel actionsPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - actionsPanel.setLayout(FRGUIPaneFactory.createM_BorderLayout()); + JPanel actionsPanel = Layouts.row(HORIZONTAL_GAP).getComponent(); { uploadButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Carton_Upload_Carton_Log")); uploadButton.addActionListener((e) -> { @@ -175,7 +182,7 @@ public class FeedbackToolboxDialog extends JDialog { } }); - actionsPanel.add(uploadButton, BorderLayout.WEST); + actionsPanel.add(uploadButton); UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); cancelButton.addActionListener((e) -> { @@ -184,7 +191,7 @@ public class FeedbackToolboxDialog extends JDialog { envDetectorDialog.setVisible(true); dispose(); }); - actionsPanel.add(cancelButton, BorderLayout.EAST); + actionsPanel.add(cancelButton); } UIButton currencySetButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Carton_General_Settings")); currencySetButton.addActionListener((e -> { diff --git a/designer-base/src/main/java/com/fr/design/carton/SwitchForSwingChecker.java b/designer-base/src/main/java/com/fr/design/carton/SwitchForSwingChecker.java index 536963bda5..66527dde5b 100644 --- a/designer-base/src/main/java/com/fr/design/carton/SwitchForSwingChecker.java +++ b/designer-base/src/main/java/com/fr/design/carton/SwitchForSwingChecker.java @@ -30,11 +30,13 @@ import java.util.Map; import java.util.Date; import java.util.Calendar; +import static com.fr.design.carton.CartonConstants.DEBUG_MAIN_CLASS_NAME; +import static com.fr.design.carton.CartonConstants.EASY_CHECKER_FILE_NAME; +import static com.fr.design.carton.CartonConstants.JOURNAL_FILE_PATH; +import static com.fr.design.carton.CartonConstants.TIMER_CHECKER_FILE_NAME; + public class SwitchForSwingChecker implements XMLReadable, XMLWriter { - /** - * Designer4Debug类名 - */ - private static final String DEBUG_MAIN_CLASS_NAME = "com.fr.start.Designer4Debug"; + /** * XML标签 */ @@ -47,18 +49,16 @@ public class SwitchForSwingChecker implements XMLReadable, XMLWriter { * 简单记录事件执行时间的开关 */ private static boolean easyChecker = false; + /** + * UI性能监控埋点的开关 + */ + private static boolean latencyMonitor = true; /** * 一个标识位用于区分耗时任务时长检测(简单检测)和timer检测 */ public static final int TIMER_CHECK_FLAG = 0; public static final int EASY_CHECK_FLAG = 1; - /** - * 日志存储地址 - */ - public static final String JOURNAL_FILE_PATH = StableUtils.pathJoin(ProductConstantsBase.getEnvHome(), "journal_log"); - public static final String EASY_CHECKER_FILE_NAME = "easy_check_log.csv"; - public static final String TIMER_CHECKER_FILE_NAME = "timer_check_log.csv"; public static boolean isCheckerTimerSwitch() { return checkerTimerSwitch; } @@ -67,6 +67,13 @@ public class SwitchForSwingChecker implements XMLReadable, XMLWriter { return easyChecker; } + /** + * 是否开启UI性能检测 + */ + public static boolean isLatencyMonitoring() { + return latencyMonitor; + } + public static volatile SwitchForSwingChecker switchForSwingChecker = new SwitchForSwingChecker(); public static SwitchForSwingChecker getInstance() { @@ -138,7 +145,7 @@ public class SwitchForSwingChecker implements XMLReadable, XMLWriter { } /** - *处理文件 + * 处理文件 * 一共四种情况， * 两个文件都不存在 * 文件一存在，文件二不存在 @@ -225,7 +232,7 @@ public class SwitchForSwingChecker implements XMLReadable, XMLWriter { /** * /埋点方法上传卡顿信息入口 - date为 2022-09-08的格式 + * date为 2022-09-08的格式 */ public static List uploadJournalLog(Date dateTime) { List res = new ArrayList<>(); @@ -246,9 +253,8 @@ public class SwitchForSwingChecker implements XMLReadable, XMLWriter { /** * 初始化监控任务，主要是替换EventQueue以及SwingWorker执行任务的线程池 - * */ - public static void initThreadMonitoring () { + public static void initThreadMonitoring() { String mainClass = System.getProperty("sun.java.command"); //判断一下,如果是以Designer4Debug启动，就不注册代码，不然会覆盖掉SwingExplorer，导致其无法使用 if (!StringUtils.equals(mainClass, DEBUG_MAIN_CLASS_NAME)) { @@ -294,6 +300,7 @@ public class SwitchForSwingChecker implements XMLReadable, XMLWriter { if (reader.isAttr()) { checkerTimerSwitch = reader.getAttrAsBoolean("checkerTimerSwitch", false); easyChecker = reader.getAttrAsBoolean("easyChecker", false); + latencyMonitor = reader.getAttrAsBoolean("latencyMonitor", true); } try { initSwitchChecker(); @@ -307,6 +314,7 @@ public class SwitchForSwingChecker implements XMLReadable, XMLWriter { writer.startTAG(XML_TAG); writer.attr("checkerTimerSwitch", checkerTimerSwitch); writer.attr("easyChecker", easyChecker); + writer.attr("latencyMonitor", latencyMonitor); writer.end(); } diff --git a/designer-base/src/main/java/com/fr/design/carton/latency/DesignerLatencyMetric.java b/designer-base/src/main/java/com/fr/design/carton/latency/DesignerLatencyMetric.java new file mode 100644 index 0000000000..75fa28ef1e --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/carton/latency/DesignerLatencyMetric.java @@ -0,0 +1,174 @@ +package com.fr.design.carton.latency; + +import com.fr.concurrent.NamedThreadFactory; +import com.fr.config.MarketConfig; +import com.fr.design.DesignerEnvManager; +import com.fr.design.carton.SwitchForSwingChecker; +import com.fr.design.mainframe.SiteCenterToken; +import com.fr.event.Event; +import com.fr.event.EventDispatcher; +import com.fr.event.Listener; +import com.fr.general.CloudCenter; +import com.fr.general.GeneralUtils; +import com.fr.general.http.HttpToolbox; +import com.fr.json.JSONObject; +import com.fr.log.FineLoggerFactory; +import com.fr.stable.StringUtils; +import com.fr.workspace.WorkContext; +import com.fr.workspace.Workspace; +import com.fr.workspace.WorkspaceEvent; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import static com.fr.design.carton.CartonConstants.APPID; +import static com.fr.design.carton.CartonConstants.DESIGNER_ID; +import static com.fr.design.carton.CartonConstants.DESIGNER_VERSION; +import static com.fr.design.carton.CartonConstants.DESIGN_METHOD; +import static com.fr.design.carton.CartonConstants.LOCAL; +import static com.fr.design.carton.CartonConstants.OPERANDS_NUM; +import static com.fr.design.carton.CartonConstants.REMOTE; +import static com.fr.design.carton.CartonConstants.TIME; +import static com.fr.design.carton.CartonConstants.USERID; + +/** + * 设计器延迟时间记录Metric + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/07/01 + */ +public class DesignerLatencyMetric { + + private String latencyUrl; + private ExecutorService executorService; + private ScheduledExecutorService scheduler; + private static final Map LATENCY_CONTAINER = new ConcurrentHashMap<>(); + + private static final String DEFAULT_MONITOR_URL = "https://cloud.fanruan.com/api/monitor/"; + private static final String LATENCY_TABLE_SUFFIX = "record_of_designer_latency/single"; + + private final static class InstanceHolder { + static final DesignerLatencyMetric INSTANCE = new DesignerLatencyMetric(); + } + + /** + * 获取单例 + */ + public static DesignerLatencyMetric getInstance() { + return DesignerLatencyMetric.InstanceHolder.INSTANCE; + } + + private DesignerLatencyMetric() { + } + + /** + * 启动 + */ + public void start() { + if (SwitchForSwingChecker.isLatencyMonitoring()) { + // 初始化容器 + initializeContainer(); + // 启动异步性能记录线程池 + executorService = Executors.newFixedThreadPool(8); + // 启动定时埋点 + this.scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("LatencyMetricWorker")); + this.scheduler.scheduleWithFixedDelay(this::collectAndSubmit, 60, 60, TimeUnit.MINUTES); + // 注册设计器工作目录切换事件监听 + EventDispatcher.listen(WorkspaceEvent.BeforeSwitch, new Listener() { + @Override + public void on(Event event, Workspace param) { + collectAndSubmit(); + } + }); + FineLoggerFactory.getLogger().info("[Latency] designer latency metric started."); + } + } + + /** + * 关闭 + */ + public void stop() { + if (SwitchForSwingChecker.isLatencyMonitoring()) { + if (this.executorService != null) { + this.executorService.shutdown(); + } + if (this.scheduler != null) { + this.scheduler.shutdown(); + } + collectAndSubmit(); + FineLoggerFactory.getLogger().info("[Latency] designer latency metric stopped."); + } + } + + private String getLatencyUrl() { + if (StringUtils.isEmpty(latencyUrl)) { + String monitorEntry = CloudCenter.getInstance().acquireUrlByKind("cloud.monitor.api.entrypoint"); + latencyUrl = (StringUtils.isNotEmpty(monitorEntry) ? monitorEntry : DEFAULT_MONITOR_URL) + + LATENCY_TABLE_SUFFIX; + } + return latencyUrl; + } + + private void initializeContainer() { + for (LatencyLevel level : LatencyLevel.values()) { + LATENCY_CONTAINER.put(level, new AtomicInteger()); + } + } + + private void resetContainer() { + LATENCY_CONTAINER.values().forEach(count -> count.set(0)); + } + + /** + * 记录性能信息 + */ + public void record(long cost) { + executorService.submit(() -> { + try { + LatencyLevel level = LatencyLevel.measure(cost); + LATENCY_CONTAINER.computeIfAbsent(level, k -> new AtomicInteger()).incrementAndGet(); + } catch (Throwable ignore) { + // 记录失败不影响业务 + } + }); + } + + /** + * 汇总并提交性能监控埋点 + */ + public void collectAndSubmit() { + Map para = new HashMap<>(); + para.put("token", SiteCenterToken.generateToken()); + para.put("content", collect()); + try { + HttpToolbox.post(getLatencyUrl(), para); + FineLoggerFactory.getLogger().debug("[Latency] submit latency log to cloud."); + } catch (Throwable t) { + FineLoggerFactory.getLogger().debug(t,"[Latency] failed to submit latency log to cloud."); + } + resetContainer(); + } + + private JSONObject collect() { + JSONObject info = new JSONObject(); + info.put(TIME, System.currentTimeMillis()); + info.put(APPID, MarketConfig.getInstance().getCloudOperationMaintenanceId()); + info.put(USERID, MarketConfig.getInstance().getBbsUid()); + info.put(DESIGNER_ID, DesignerEnvManager.getEnvManager().getUUID()); + info.put(DESIGNER_VERSION, GeneralUtils.getVersion()); + info.put(DESIGN_METHOD, WorkContext.getCurrent().isLocal() ? LOCAL : REMOTE); + info.put(OPERANDS_NUM, LATENCY_CONTAINER.values().stream().mapToInt(AtomicInteger::get).sum()); + for (Map.Entry entry : LATENCY_CONTAINER.entrySet()) { + info.put(entry.getKey().getMark(), entry.getValue().get()); + } + return info; + } + +} diff --git a/designer-base/src/main/java/com/fr/design/carton/latency/LatencyLevel.java b/designer-base/src/main/java/com/fr/design/carton/latency/LatencyLevel.java new file mode 100644 index 0000000000..f190bb883d --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/carton/latency/LatencyLevel.java @@ -0,0 +1,65 @@ +package com.fr.design.carton.latency; + +/** + * 卡顿等级 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/07/01 + */ +public enum LatencyLevel { + + // 非常流畅 + FLASH(0, 50, "waitNum1"), + // 流畅 + SMOOTH(50, 100, "waitNum2"), + // 轻微卡顿 + SLIGHT(100, 200, "waitNum3"), + // 中等卡顿 + MILD(200, 500, "waitNum4"), + // 明显卡顿 + NOTICEABLE(500, 1000, "waitNum5"), + // 严重卡顿 + SERVE(1000, 2000, "waitNum6"), + // 非常严重卡顿 + EXTREME(2000, 3000, "waitNum7"), + // 极度卡顿 + CRITICAL(3000, Long.MAX_VALUE, "waitNum8"); + + final long start; + final long end; + final String mark; + + LatencyLevel(long start, long end, String mark) { + this.start = start; + this.end = end; + this.mark = mark; + } + + public long getStart() { + return start; + } + + public long getEnd() { + return end; + } + + public String getMark() { + return mark; + } + + /** + * 评估当前卡顿等级 + * + * @param cost UI-EventQueue响应耗时 + * @return 卡顿等级 + */ + public static LatencyLevel measure(long cost) { + for (LatencyLevel level : LatencyLevel.values()) { + if (cost >= level.getStart() && cost < level.getEnd()) { + return level; + } + } + return CRITICAL; + } +} diff --git a/designer-base/src/main/java/com/fr/design/condition/CellHighlightAddMenuDef.java b/designer-base/src/main/java/com/fr/design/condition/CellHighlightAddMenuDef.java index 6d142b4ebe..fe47d1088c 100644 --- a/designer-base/src/main/java/com/fr/design/condition/CellHighlightAddMenuDef.java +++ b/designer-base/src/main/java/com/fr/design/condition/CellHighlightAddMenuDef.java @@ -29,7 +29,9 @@ public class CellHighlightAddMenuDef extends MenuDef { // 生成UIButton,iconpath不可为null public UIButton createUIButton() { if (createdButton == null) { - if (this.iconPath != null && this.name != null) { + if (icon != null) { + createdButton = new UIButton(icon); + } else if (this.iconPath != null && this.name != null) { createdButton = new UIButton(BaseUtils.readIcon(this.iconPath)); } else if (this.iconPath != null) { createdButton = new UIButton(BaseUtils.readIcon(this.iconPath)); diff --git a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java index 5d6ee4e5ac..bc2eca9fd1 100644 --- a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java @@ -1,6 +1,11 @@ package com.fr.design.condition; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.common.annotations.Open; import com.fr.design.actions.UpdateAction; import com.fr.design.beans.BasicBeanPane; @@ -10,18 +15,25 @@ import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; -import javax.swing.BoxLayout; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JScrollPane; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import java.awt.Dimension; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; @Open public abstract class ConditionAttributesPane extends BasicBeanPane { - private static final int MIN_HEIGHT = 60; + private static final int MAT_HEIGHT = FineUIScale.scale(120); protected CellHighlightAddMenuDef menuDef; protected JPanel selectedItemPane; @@ -33,44 +45,57 @@ public abstract class ConditionAttributesPane extends BasicBeanPane { //可用的Actions. protected java.util.List useAbleActionList = new java.util.ArrayList(); - protected void initComponents() { - this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); - - // 属性 界面 - JPanel propertyChangePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); - this.add(propertyChangePane); + protected JScrollPane selectedItemScrollPane = new JScrollPane() { + @Override + public Dimension getPreferredSize() { + Dimension size = super.getPreferredSize(); + if (size.height > MAT_HEIGHT) { + size.height = MAT_HEIGHT; + } + return size; + } + }; - propertyChangePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property") + ":", null)); + protected void initComponents() { + this.setLayout(new BorderLayout()); // 选择要改变的属性. - JPanel addItemPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + JPanel addItemPane = new JPanel(new BorderLayout()); ToolBarDef toolbarDef = new ToolBarDef(); menuDef = new CellHighlightAddMenuDef(); menuDef.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Highlight_Click_to_Choose_Property_To_Modify")); - menuDef.setIconPath("com/fr/design/images/control/addPopup.png"); + menuDef.setIcon(new LazyIcon("add_popup")); toolbarDef.addShortCut(menuDef); updateMenuDef(); UIToolbar toolBar = ToolBarDef.createJToolBar(); + toolBar.setLayout(new BorderLayout()); + toolBar.setBorder(new FineRoundBorder()); + toolBar.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); toolbarDef.updateToolBar(toolBar); - addItemPane.add(toolBar); + addItemPane.add(toolBar, BorderLayout.WEST); - propertyChangePane.add(addItemPane); + addItemPane.setBorder(new FineRoundBorder()); + addItemPane.setPreferredSize(new Dimension(addItemPane.getPreferredSize().width, FineUIScale.scale(24))); selectedItemPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); -// selectedItemPane.setLayout(new BoxLayout(selectedItemPane,BoxLayout.Y_AXIS)); // 选中的添加Itempane - JScrollPane selectedItemScrollPane = new JScrollPane(); selectedItemScrollPane.setViewportView(selectedItemPane); selectedItemScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - selectedItemScrollPane.setMinimumSize(new Dimension((int) selectedItemScrollPane.getPreferredSize().getWidth(), MIN_HEIGHT)); + dealScrollPane(selectedItemScrollPane); - propertyChangePane.add(selectedItemScrollPane); + + this.add(FineUIUtils.wrapComponentWithTitle(column( + 10, + row(cell(addItemPane), flex()), + cell(selectedItemScrollPane).with(it -> it.setBorder(new FineRoundBorder())), + fix(10) + ).getComponent(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property")), BorderLayout.NORTH); } protected void dealScrollPane(JScrollPane scrollPane){ diff --git a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java index 1422202a14..cee0410a95 100644 --- a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java @@ -1,5 +1,6 @@ package com.fr.design.condition; +import com.fine.theme.utils.FineUIScale; import com.fr.data.condition.CommonCondition; import com.fr.data.condition.JoinCondition; import com.fr.data.core.Compare; @@ -115,11 +116,15 @@ public class DSColumnLiteConditionPane extends LiteConditionPane extends BasicBeanPa private JPanel conditionCardPane; protected BasicBeanPane defaultConditionPane; // card2 + private UILabel conditionTitleLabel; private UITextArea formulaTextArea; private UIButton modifyButton; private UIButton addButton; @@ -71,10 +84,6 @@ public abstract class LiteConditionPane extends BasicBeanPa private UIButton moveDownButton; private UIButton bracketButton; private UIButton unBracketButton; - private static final int DOWN_PADDING = 4; - private static final int STRUT_ONE = 35; - private static final int STRUT_TWO = 4; - private static final int ADD_CONTROL_PANE_PADDING_RIGHT = -5; private ActionListener actionListener1 = new ActionListener() { @@ -407,74 +416,82 @@ public abstract class LiteConditionPane extends BasicBeanPa protected abstract VariableResolver variableResolver4FormulaPane(); protected void initComponents() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setLayout(new BorderLayout(0, FineUIScale.scale(10))); // north initNorth(); //center - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + JPanel centerPane = new JPanel(new BorderLayout(0, FineUIScale.scale(10))); this.add(centerPane, BorderLayout.CENTER); - centerPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - - // Control - JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.add(controlPane, BorderLayout.NORTH); - // controlPane.setLayout(FRGUIPaneFactory.createBorderLayout()); // conditionCardPane - initConditionCardPane(controlPane); + initConditionCardPane(); + centerPane.add(conditionCardPane, BorderLayout.NORTH); - // addControlPane, contains or,and Radio, add,modify Button - initControlPane(controlPane); + // northButtonPane, contains or,and Radio, add,modify Button + JPanel northButtonPane = initNorthButtonPane(); // Preview - JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.add(previewPane, BorderLayout.CENTER); - previewPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 2, 0)); - - - // conTreeScrollPane.setPreferredSize(new Dimension(400, 125)); - previewPane.add(iniTreeScrollPane(), BorderLayout.CENTER); + JPanel buttonPane = initButtonPane(); + JScrollPane treeScrollPane = iniTreeScrollPane(); + // 滚动面板不能直接加入row-col布局，需设定宽高 + treeScrollPane.setPreferredSize(FineUIScale.scale(new Dimension(600, 240))); + JPanel previewPane = column( + cell(northButtonPane), + row( + cell(treeScrollPane).weight(0.75), cell(buttonPane).weight(0.25) + ).weight(1) + ).with(it -> { + it.setBorder(new FineRoundBorder()); + it.setOpaque(true); + it.setBackground(FlatUIUtils.getUIColor("fill.normal", Color.WHITE)); + }).getComponent(); conditionsTree.addTreeSelectionListener(treeSelectionListener); - JPanel buttonPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); - previewPane.add(GUICoreUtils.createBorderPane(buttonPane, BorderLayout.NORTH), BorderLayout.EAST); - initButtonPane(buttonPane); + centerPane.add(previewPane, BorderLayout.CENTER); // peter:必须要检查Enabled. checkButtonEnabledForList(); } - private void initButtonPane(JPanel buttonPane) { + private JPanel initButtonPane() { removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); - buttonPane.add(removeButton); - removeButton.setIcon(BaseUtils.readIcon("com/fr/base/images/cell/control/remove.png")); + removeButton.setIcon(new LazyIcon("remove")); + removeButton.setDisabledIcon(new LazyIcon("remove").disabled()); removeButton.setEnabled(false); removeButton.addActionListener(actionListener3); moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); - buttonPane.add(moveUpButton); - moveUpButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/up.png")); + moveUpButton.setIcon(new LazyIcon("move_up")); + moveUpButton.setDisabledIcon(new LazyIcon("move_up").disabled()); moveUpButton.addActionListener(actionListener4); moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); - buttonPane.add(moveDownButton); - moveDownButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/down.png")); + moveDownButton.setIcon(new LazyIcon("move_down")); + moveDownButton.setDisabledIcon(new LazyIcon("move_down").disabled()); moveDownButton.addActionListener(actionListener5); // peter:加括号 bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Add_bracket")); - buttonPane.add(bracketButton); - bracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/bracket.png")); + bracketButton.setIcon(new LazyIcon("bracket")); + bracketButton.setDisabledIcon(new LazyIcon("bracket").disabled()); bracketButton.addActionListener(actionListener6); // peter:去掉括号 unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Remove_bracket")); - buttonPane.add(unBracketButton); - unBracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/unBracket.png")); + unBracketButton.setIcon(new LazyIcon("unBracket")); + unBracketButton.setDisabledIcon(new LazyIcon("unBracket").disabled()); unBracketButton.addActionListener(actionListener7); + + return column(LayoutConstants.VERTICAL_GAP, + cell(removeButton), + cell(moveUpButton), + cell(moveDownButton), + cell(bracketButton), + cell(unBracketButton) + ).with(it -> it.setBorder(new ScaledEmptyBorder(5, 5, 0, 5))).getComponent(); } private JScrollPane iniTreeScrollPane() { @@ -484,26 +501,29 @@ public abstract class LiteConditionPane extends BasicBeanPa conditionsTree.setSelectionModel(new ContinuousTreeSelectionModel()); conditionsTree.addTreeExpansionListener(treeExpansionListener); conditionsTree.setShowsRootHandles(true); - return new JScrollPane(conditionsTree); + conditionsTree.setBackground(FlatUIUtils.getUIColor("fill.normal", Color.WHITE)); + JScrollPane scrollPane = new JScrollPane(conditionsTree); + scrollPane.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, + FineUIUtils.getUIColor("Label.borderColor", "defaultBorderColor"))); + return scrollPane; } private void initNorth() { - conditonTypePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(conditonTypePane, BorderLayout.NORTH); - conditonTypePane.setBorder(new ModLineBorder(ModLineBorder.BOTTOM)); - + conditionTitleLabel = new UILabel(); + FineUIUtils.wrapBoldLabelWithUnderline(conditionTitleLabel); UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type") + ":"); - conditonTypePane.add(conditionTypeLabel, BorderLayout.WEST); - conditionTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0)); - - JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); - conditonTypePane.add(northPane, BorderLayout.CENTER); - northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0)); - northPane.add(GUICoreUtils.createFlowPane(commonRadioButton, FlowLayout.CENTER)); - northPane.add(GUICoreUtils.createFlowPane(formulaRadioButton, FlowLayout.CENTER)); + conditionTypeLabel.setPreferredSize(FineUIScale.scale(new Dimension(68, 24))); commonRadioButton.addActionListener(radioActionListener); formulaRadioButton.addActionListener(radioActionListener); + conditonTypePane = row( + cell(conditionTypeLabel), fix(LayoutConstants.VGAP_MEDIUM), cell(commonRadioButton), fix(10), cell(formulaRadioButton), flex() + ).getComponent(); + JPanel conditionWrapperPane = column(10, + cell(conditionTitleLabel), + cell(conditonTypePane) + ).getComponent(); + this.add(conditionWrapperPane, BorderLayout.NORTH); ButtonGroup mainBg = new ButtonGroup(); mainBg.add(commonRadioButton); @@ -511,74 +531,61 @@ public abstract class LiteConditionPane extends BasicBeanPa commonRadioButton.setSelected(true); } - private void initConditionCardPane(JPanel controlPane) { + private void initConditionCardPane() { conditionCardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); - controlPane.add(conditionCardPane, BorderLayout.CENTER); conditionCardPane.setLayout(new CardLayout()); - conditionCardPane.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0)); - // defaultConditionPane conditionCardPane.add(defaultConditionPane = createUnFormulaConditionPane(), "DEFAULT"); - // formulaConditionPane JPanel formulaConditionPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); conditionCardPane.add(formulaConditionPane, "FORMULA"); - // formulaConditionPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - - // formulaPane - JPanel formulaPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - // 95106 公式区域限定宽高, 显示两行即可, 在新窗口编辑. - formulaPane.setPreferredSize(new Dimension(450, 40)); - formulaConditionPane.add(formulaPane, BorderLayout.CENTER); - formulaPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 2)); - formulaPane.add(GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST); formulaTextArea = new UITextArea(); - formulaPane.add(new JScrollPane(formulaTextArea), BorderLayout.CENTER); UIButton editFormulaButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Define")); - formulaPane.add(GUICoreUtils.createBorderPane(editFormulaButton, BorderLayout.NORTH), BorderLayout.EAST); + formulaConditionPane.add(row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula") + " =")) + .with(it -> it.setPreferredSize(FineUIScale.scale(new Dimension(68, 24)))), + fix(LayoutConstants.VGAP_MEDIUM), + cell(formulaTextArea).weight(2), + fix(10), + cell(editFormulaButton)) + .getComponent()); editFormulaButton.addActionListener(actionListener1); + applyCardsPane(); } - private void initControlPane(JPanel controlPane) { - JPanel addControlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - addControlPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, ADD_CONTROL_PANE_PADDING_RIGHT)); - JPanel splitPane = new JPanel(); - splitPane.setBorder(new ModLineBorder(ModLineBorder.TOP)); - - JPanel addControlPaneWrapper = new JPanel(new BorderLayout()); - addControlPaneWrapper.add(addControlPane, BorderLayout.CENTER); - addControlPaneWrapper.add(splitPane, BorderLayout.NORTH); - controlPane.add(addControlPaneWrapper, BorderLayout.SOUTH); - + private JPanel initNorthButtonPane() { ButtonGroup bg = new ButtonGroup(); bg.add(andRadioButton); bg.add(orRadioButton); - andRadioButton.setSelected(true); - JPanel radioPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); - addControlPane.add(radioPane); - radioPane.add(andRadioButton); - radioPane.add(orRadioButton); - - addControlPane.add(Box.createHorizontalStrut(STRUT_ONE)); - - addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"), BaseUtils.readIcon("com/fr/base/images/cell/control/add.png")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"), new LazyIcon("add")); + addButton.setDisabledIcon(new LazyIcon("add").disabled()); addButton.setMnemonic('A'); - addControlPane.add(addButton); addButton.addActionListener(actionListener2); - - addControlPane.add(Box.createHorizontalStrut(STRUT_TWO)); - - modifyButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Modify"), BaseUtils.readIcon("com/fr/base/images/cell/control/rename.png")); + modifyButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Modify"), new LazyIcon("edit")); + modifyButton.setDisabledIcon(new LazyIcon("edit").disabled()); modifyButton.setMnemonic('M'); - addControlPane.add(modifyButton); modifyButton.addActionListener(actionListener8); - - // peter:当鼠标进入修改按钮的时候,如果是ListConditon内容编辑区域不可编辑 + // peter:当鼠标进入修改按钮的时候,如果是ListCondition内容编辑区域不可编辑 modifyButton.addMouseListener(mouseAdapter); + + return row( + row(5, + cell(andRadioButton).weight(0.5), + cell(orRadioButton).weight(0.5) + ).weight(0.35), + flex(0.3), + row(5, + cell(addButton).weight(0.5), + cell(modifyButton).weight(0.5) + ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 8, 0, 0))).weight(0.35) + ).with(it -> it.setBorder(BorderFactory.createCompoundBorder( + FineBorderFactory.createDefaultUnderlineBorder(), + new ScaledEmptyBorder(5, 5, 5, 5)) + )).getComponent(); } @@ -662,10 +669,10 @@ public abstract class LiteConditionPane extends BasicBeanPa private void applyCardsPane() { CardLayout cl = (CardLayout) (conditionCardPane.getLayout()); if (this.commonRadioButton.isSelected()) { - this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Common_Condition"), null)); + conditionTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Common_Condition")); cl.show(conditionCardPane, "DEFAULT"); } else { - this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula_Condition"), null)); + conditionTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula_Condition")); cl.show(conditionCardPane, "FORMULA"); } } diff --git a/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java index c39d5b7446..a59c925405 100644 --- a/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java @@ -2,8 +2,11 @@ package com.fr.design.condition; import java.awt.BorderLayout; import java.awt.Component; +import java.awt.Dimension; import javax.swing.DefaultComboBoxModel; + +import com.fine.theme.utils.FineUIScale; import com.fr.design.gui.ilable.UILabel; import javax.swing.JList; import javax.swing.JPanel; @@ -22,6 +25,9 @@ import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.stable.StringUtils; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; + public class ObjectLiteConditionPane extends LiteConditionPane { @Override @@ -57,6 +63,7 @@ public class ObjectLiteConditionPane extends LiteConditionPane this.setLayout(FRGUIPaneFactory.createBorderLayout()); // condition operation conditionOPComboBox = new UIComboBox(); + conditionOPComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); DefaultComboBoxModel opComboBoxModel = (DefaultComboBoxModel) conditionOPComboBox.getModel(); int[] allOperators = Compare.getAllOperators(); for (int i = 0; i < allOperators.length; i++) { @@ -78,13 +85,14 @@ public class ObjectLiteConditionPane extends LiteConditionPane }); conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPaneWithGlobalListener(); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Operator") + ":"); + label.setPreferredSize(FineUIScale.scale(new Dimension(68, 24))); - Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Operator") + ":"), new UILabel() }, - { conditionOPComboBox, conditionValuePane } }; + Component[][] components = { { label, conditionOPComboBox, conditionValuePane }}; double p = TableLayout.PREFERRED; - double rowSize[] = { p, p }; - double columnSize[] = { p, TableLayout.FILL }; + double rowSize[] = { p }; + double columnSize[] = { p, p, TableLayout.FILL }; JPanel leftPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.add(leftPanel, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java index 17dedf60aa..48c23bab51 100644 --- a/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java @@ -1,10 +1,13 @@ package com.fr.design.condition; -import java.awt.Insets; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; @@ -21,19 +24,27 @@ public abstract class SingleConditionPane extends BasicPane { } public SingleConditionPane(boolean isRemove) { - this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); + this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(10, 0)); if (isRemove) { if(cancel == null) { - cancel = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); + cancel = new UIButton(new LazyIcon("remove")); cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); cancel.addActionListener(cancleListener); cancel.setMargin(new Insets(0, 0, 0, 0)); + cancel.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); + cancel.setBackground(FlatUIUtils.getUIColor("default.background", new Color(246, 248, 250, 255))); } - - this.add(cancel); + addCancel(); } } + + /** + * 添加删除按钮 + */ + public void addCancel() { + this.add(cancel, BorderLayout.EAST); + } ActionListener cancleListener = new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java b/designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java index 149923c1a8..8b2fd695a0 100644 --- a/designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java +++ b/designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java @@ -17,6 +17,10 @@ public class LayoutConstants { * 水平间隙 */ public static final int HGAP_SMALL = 1; + /** + * 水平间隙 + */ + public static final int HGAP_MEDIUM = 2; /** * 水平间隙 */ @@ -42,4 +46,24 @@ public class LayoutConstants { * 图表属性表中二级菜单距离右边框的距离 */ public static final int CHART_ATTR_TOMARGIN = 46; + + /** + * 主题化布局：水平间隙 + */ + public static final int HORIZONTAL_GAP = 10; + + /** + * 主题化布局：垂直间隙 + */ + public static final int VERTICAL_GAP = 10; + + /** + * 主题化布局：常规布局左侧比例 + */ + public static final double LEFT_WEIGHT = 1.2; + + /** + * 主题化布局：常规布局右侧比例 + */ + public static final double RIGHT_WEIGHT = 3; } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java index eba4a5634a..792ab91365 100644 --- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java +++ b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java @@ -3,6 +3,7 @@ */ package com.fr.design.constants; +import com.fine.theme.icon.LazyIcon; import com.fr.base.svg.IconUtils; import com.fr.base.svg.SVGLoader; import com.fr.general.IOUtils; @@ -222,10 +223,10 @@ public interface UIConstants { public static final int LARGEARC = 6; public static final Stroke BS = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 2f, new float[]{3, 1}, 0); public static final Icon PREVIEW_DOWN = IconUtils.readIcon("/com/fr/design/standard/preview_down_icon"); - public static final Icon CLOSE_OF_AUTHORITY = IOUtils.readIcon("/com/fr/design/images/m_report/close.png"); - public static final Icon CLOSE_OVER_AUTHORITY = IOUtils.readIcon("/com/fr/design/images/m_report/close_over.png"); - public static final Icon CLOSE_PRESS_AUTHORITY = IOUtils.readIcon("/com/fr/design/images/m_report/close_press.png"); public static final int CLOSE_AUTHORITY_HEIGHT_AND_WIDTH = 24; + public static final Icon CLOSE_OF_AUTHORITY = new LazyIcon("platform_close", CLOSE_AUTHORITY_HEIGHT_AND_WIDTH).disabled(); + public static final Icon CLOSE_OVER_AUTHORITY = new LazyIcon("platform_close", CLOSE_AUTHORITY_HEIGHT_AND_WIDTH); + public static final Icon CLOSE_PRESS_AUTHORITY = new LazyIcon("platform_close", CLOSE_AUTHORITY_HEIGHT_AND_WIDTH); /** diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java index af9850172b..8c1252651a 100644 --- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java @@ -1,6 +1,6 @@ package com.fr.design.data; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; import com.fr.base.svg.IconUtils; import com.fr.data.MultiResultTableData; @@ -431,7 +431,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp public PreviewTableDataAction(TableDataTree dataTree) { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); this.setMnemonic('p'); - this.setSmallIcon("/com/fr/design/standard/previewdateset/preview"); + this.setSmallIcon(new LazyIcon("preview")); this.dataTree = dataTree; } @@ -508,7 +508,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp public ConnectionTableAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Define_Data_Connection")); this.setMnemonic('D'); - this.setSmallIcon("/com/fr/design/standard/connection", false); + this.setSmallIcon(new LazyIcon("connection")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java index fab38db6fc..4229b54036 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java @@ -138,11 +138,11 @@ public class ChoosePane extends BasicBeanPane implements Refresha } public ChoosePane(Previewable parent, int labelSize) { - this.initBasicComponet(); + this.initBasicComponent(); this.initComponentsLayout(new PreviewLabel(parent == null ? this : parent), labelSize); } - private void initBasicComponet() { + private void initBasicComponent() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); dsNameComboBox = new StringUIComboBox(); @@ -227,9 +227,9 @@ public class ChoosePane extends BasicBeanPane implements Refresha } protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) { - UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":"); - UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model") + ":"); - UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table") + ":"); + UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database")); + UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model")); + UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table")); if (labelSize > 0) { Dimension pSize = new Dimension(labelSize, 25); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java index 9d9ce6524b..8d1192a581 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java @@ -1,5 +1,7 @@ package com.fr.design.data.datapane; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.icheckbox.UICheckBox; @@ -34,6 +36,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + /** * @author rinoux * @version 10.0 @@ -73,21 +78,24 @@ public class ESDStrategyConfigPane extends BasicBeanPane { setLayout(FRGUIPaneFactory.createM_BorderLayout()); this.selectAutoUpdate = new UIRadioButton(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Every_Interval")); - this.updateInterval = new UITextField(4); this.shouldEvolve = new UICheckBox(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Auto_Evolved_Strategy"), false); this.shouldEvolve.setEnabled(false); + this.shouldEvolve.setBorder(new ScaledEmptyBorder(0, 4, 0, 0)); this.updateIntervalCheckTips = new UILabel(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Error_Interval_Format")); this.updateIntervalCheckTips.setForeground(Color.RED); this.updateIntervalCheckTips.setVisible(false); - this.selectBySchema = new UIRadioButton(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Cron")); this.schemaTime = new UITextField(10); this.schemaTimeCheckTips = new UILabel(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Error_Time_Format")); this.schemaTimeCheckTips.setVisible(false); this.schemaTimeCheckTips.setForeground(Color.RED); + addListener(); + addCenterPanel(); + } + private void addListener() { this.selectAutoUpdate.addActionListener(new AbstractAction() { public void actionPerformed(ActionEvent e) { ESDStrategyConfigPane.this.selectBySchema.setSelected(!ESDStrategyConfigPane.this.selectAutoUpdate.isSelected()); @@ -106,19 +114,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane { } }); - JPanel pane = FRGUIPaneFactory.createVerticalTitledBorderPane(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Cache_Update_Strategy")); - add(pane, BorderLayout.NORTH); - - JPanel row1 = GUICoreUtils.createFlowPane(new Component[]{ - this.selectAutoUpdate, - this.updateInterval, - new UILabel(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Minute_Update_Cache")), - this.shouldEvolve, - this.updateIntervalCheckTips - }, 0, 5); - pane.add(row1); - - ActionLabel actionLabel = new ActionLabel(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Cron_Help")); + actionLabel = new ActionLabel(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Cron_Help")); actionLabel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -129,6 +125,16 @@ public class ESDStrategyConfigPane extends BasicBeanPane { } } }); + } + + private void addCenterPanel() { + JPanel row1 = GUICoreUtils.createFlowPane(new Component[]{ + this.selectAutoUpdate, + this.updateInterval, + new UILabel(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Minute_Update_Cache")), + this.shouldEvolve, + this.updateIntervalCheckTips + }, 0, 5); JPanel row2 = GUICoreUtils.createFlowPane(new Component[]{ this.selectBySchema, @@ -136,7 +142,9 @@ public class ESDStrategyConfigPane extends BasicBeanPane { actionLabel, this.schemaTimeCheckTips }, 0, 5); - pane.add(row2); + + add(FineUIUtils.wrapComponentWithTitle(column(10, cell(row1), cell(row2)).getComponent(), + InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Cache_Update_Strategy")), BorderLayout.NORTH); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/RefreshLabel.java b/designer-base/src/main/java/com/fr/design/data/datapane/RefreshLabel.java index 1971c77809..ac4a407732 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/RefreshLabel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/RefreshLabel.java @@ -1,11 +1,11 @@ package com.fr.design.data.datapane; +import com.fine.theme.icon.LazyIcon; import java.awt.Cursor; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import com.fr.base.BaseUtils; import com.fr.design.gui.ibutton.UIButton; @@ -15,7 +15,7 @@ public class RefreshLabel extends UIButton { private Refreshable refreshable; public RefreshLabel(Refreshable refreshable) { - super(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); + super(new LazyIcon("refresh")); this.refreshable = refreshable; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java index ebbdbf0f35..3db9c3aff1 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java @@ -11,7 +11,6 @@ import javax.swing.JList; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.data.TableDataSource; import com.fr.design.data.tabledata.Prepare4DataSourceChange; @@ -48,14 +47,15 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { JLabel renderer = (JLabel)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - if (value instanceof TableDataWrapper) { + if (index == -1 && value == null) { + // 显示空白 + renderer.setIcon(null); + renderer.setText(StringUtils.EMPTY); + }else if (value instanceof TableDataWrapper) { TableDataWrapper tabledatawrappe = (TableDataWrapper)value; renderer.setIcon(tabledatawrappe.getIcon()); renderer.setText(tabledatawrappe.getTableDataName()); renderer.setToolTipText(tabledatawrappe.getTableDataName()); - } else { - renderer.setIcon(null); - renderer.setText(StringUtils.EMPTY); } return renderer; } @@ -75,7 +75,7 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC setDsMap(); DefaultComboBoxModel model = new DefaultComboBoxModel(); this.setModel(model); - model.addElement(UIConstants.PENDING); + // 遍历添加所有数据项到模型 Iterator> entryIt = dsMap.entrySet().iterator(); while (entryIt.hasNext()) { TableDataWrapper tableDataWrapper = entryIt.next().getValue(); @@ -83,6 +83,8 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC model.addElement(tableDataWrapper); } } + // 设置默认选项为空白 + this.setSelectedItem(null); if (dataWrapper != null) { if (DesignTableDataManager.isDsNameChanged(dataWrapper.getTableDataName())) { this.setSelectedTableDataByName(DesignTableDataManager.getChangedDsNameByOldDsName(dataWrapper.getTableDataName())); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java index 0d1d9127a0..8d98e11357 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java @@ -4,6 +4,13 @@ package com.fr.design.data.datapane; +import com.fr.data.impl.ClassTableData; +import com.fr.data.impl.ConditionTableData; +import com.fr.data.impl.DBTableData; +import com.fr.data.impl.EmbeddedTableData; +import com.fr.data.impl.FileTableData; +import com.fr.data.impl.RecursionTableData; +import com.fine.theme.icon.LazyIcon; import com.fr.data.impl.ClassTableData; import com.fr.data.impl.ConditionTableData; import com.fr.data.impl.DBTableData; @@ -24,6 +31,16 @@ import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; import com.fr.design.data.tabledata.tabledatapane.ProcedureDataPane; import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.ClassTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.EmbeddedTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.FileTableDataSmallHeightPane; +import com.fr.design.data.tabledata.tabledatapane.FileTableDataSmallPane; +import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.ProcedureDataPane; +import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; import com.fr.stable.ArrayUtils; import com.fr.workspace.WorkContext; @@ -51,33 +68,33 @@ public class TableDataCreatorProducer { public TableDataNameObjectCreator[] createReportTableDataCreator() { TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"), "ds", - "/com/fr/design/standard/database_normal.svg", DBTableData.class, DBTableDataPane.class); + new LazyIcon("database"), DBTableData.class, DBTableDataPane.class); TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), "Class", - "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class, ClassTableDataPane.class); + new LazyIcon("class_table_data"), ClassTableData.class, ClassTableDataPane.class); TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"), "Embedded", - "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class); + new LazyIcon("data_table"), EmbeddedTableData.class, EmbeddedTableDataPane.class); TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"), "Multi", - "/com/fr/design/standard/multi_normal.svg", ConditionTableData.class, MultiTDTableDataPane.class) { + new LazyIcon("multi"), ConditionTableData.class, MultiTDTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"), "File", - "/com/fr/design/standard/file_normal.svg", FileTableData.class, FileTableDataSmallHeightPane.class); + new LazyIcon("file"), FileTableData.class, FileTableDataSmallHeightPane.class); TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"), "Tree", - "/com/fr/design/standard/tree_normal.svg", RecursionTableData.class, TreeTableDataPane.class) { + new LazyIcon("tree"), RecursionTableData.class, TreeTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"), "Proc", - "/com/fr/design/standard/store_procedure_normal.svg", + new LazyIcon("store_procedure"), StoreProcedure.class, ProcedureDataPane.class) { @Override public boolean shouldInsertSeparator() { @@ -106,35 +123,39 @@ public class TableDataCreatorProducer { } } + /** + * 服务器数据集 + * @return TableDataNameObjectCreator[] + */ public TableDataNameObjectCreator[] createServerTableDataCreator() { TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"), - "/com/fr/design/standard/server_database_normal.svg", DBTableData.class, + new LazyIcon("server_database"), DBTableData.class, DBTableDataPane.class); TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), - "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class, + new LazyIcon("class_table_data"), ClassTableData.class, ClassTableDataPane.class); TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"), - "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, + new LazyIcon("data_table"), EmbeddedTableData.class, EmbeddedTableDataPane.class); TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"), - "/com/fr/design/standard/file_normal.svg", FileTableData.class, + new LazyIcon("file"), FileTableData.class, FileTableDataSmallPane.class); TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"), - "/com/fr/design/standard/tree_normal.svg", + new LazyIcon("tree"), RecursionTableData.class, GlobalTreeTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; - TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"), - "/com/fr/design/standard/multi_normal.svg", + TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"), + new LazyIcon("multi"), ConditionTableData.class, GlobalMultiTDTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Stored_Procedure"), - "/com/fr/design/standard/store_procedure_normal.svg", + new LazyIcon("store_procedure"), StoreProcedure.class, ProcedureDataPane.class) { @Override public boolean shouldInsertSeparator() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java index 0ee4599159..ea0f00973a 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java @@ -1,7 +1,6 @@ package com.fr.design.data.datapane; -import com.fr.base.BaseUtils; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.svg.SVGLoader; import com.fr.data.impl.DBTableData; import com.fr.design.actions.tabledata.TableDataAction; @@ -52,6 +51,9 @@ public class TableDataNameObjectCreator extends NameObjectCreator { prefix = action.getPrefix(); } + /** + * 改用{@link TableDataNameObjectCreator#TableDataNameObjectCreator(String, Icon, Class, Class)} + */ public TableDataNameObjectCreator(String menuName, String iconPath, Class clazz, Class updatePane) { super(menuName, iconPath, clazz, updatePane); if (iconPath != null) { @@ -60,6 +62,14 @@ public class TableDataNameObjectCreator extends NameObjectCreator { } } + public TableDataNameObjectCreator(String menuName, Icon icon, Class clazz, Class updatePane) { + super(menuName, icon, clazz, updatePane); + } + + /** + * 改用{@link TableDataNameObjectCreator#TableDataNameObjectCreator(String, String, Icon, Class, Class)} + */ + @Deprecated public TableDataNameObjectCreator(String menuName, String prefix, String iconPath, Class clazz, Class updatePane) { super(menuName, iconPath, clazz, updatePane); if (iconPath != null) { @@ -69,6 +79,15 @@ public class TableDataNameObjectCreator extends NameObjectCreator { this.prefix = prefix; } + public TableDataNameObjectCreator(String menuName, String prefix, Icon icon, Class clazz, Class updatePane) { + super(menuName, icon, clazz, updatePane); + this.prefix = prefix; + } + + /** + * 改用{@link TableDataNameObjectCreator#TableDataNameObjectCreator(String, Icon, Class, Class, Class)} + */ + @Deprecated public TableDataNameObjectCreator(String menuName, String iconPath, Class clazz, Class clazz4Init, Class updatePane) { super(menuName, iconPath, clazz, clazz4Init, updatePane); if (iconPath != null) { @@ -77,6 +96,14 @@ public class TableDataNameObjectCreator extends NameObjectCreator { } } + public TableDataNameObjectCreator(String menuName, Icon icon, Class clazz, Class clazz4Init, Class updatePane) { + super(menuName, icon, clazz, clazz4Init, updatePane); + } + + /** + * 改用{@link TableDataNameObjectCreator#TableDataNameObjectCreator(String, String, Icon, Class, Class, Class)} + */ + @Deprecated public TableDataNameObjectCreator(String menuName, String prefix, String iconPath, Class clazz, Class clazz4Init, Class updatePane) { super(menuName, iconPath, clazz, clazz4Init, updatePane); if (iconPath != null) { @@ -86,6 +113,11 @@ public class TableDataNameObjectCreator extends NameObjectCreator { this.prefix = prefix; } + public TableDataNameObjectCreator(String menuName, String prefix, Icon icon, Class clazz, Class clazz4Init, Class updatePane) { + super(menuName, icon, clazz, clazz4Init, updatePane); + this.prefix = prefix; + } + @Override protected void doSthChanged4Icon(Object ob) { @@ -109,8 +141,20 @@ public class TableDataNameObjectCreator extends NameObjectCreator { return iconPath; } + /** + * 菜单图标，后续WarningIcon优化 + * @return Icon + */ private Icon createMenuIcon() { - return b ? new WarningIcon(this.menuImage) : this.menuIcon; + if(b) { + if (this.menuIcon instanceof LazyIcon) { + LazyIcon lazyIcon = (LazyIcon) this.menuIcon; + return new LazyIcon(lazyIcon.getId() + "_warning"); + } else { + return new WarningIcon(this.menuImage); + } + } + return this.menuIcon; } /** diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java index ed08cffddf..ca7cb38b4b 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java @@ -1,23 +1,22 @@ package com.fr.design.data.datapane; +import com.fine.theme.icon.LazyIcon; import com.fr.base.svg.IconUtils; import com.fr.data.MultiResultTableData; -import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; +import com.fr.design.gui.itree.filetree.FineTreeCellRender; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree; import com.fr.design.icon.IconPathConstants; import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; -import javax.swing.BorderFactory; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import java.awt.Color; import java.awt.Component; import java.util.ArrayList; import java.util.HashMap; @@ -44,7 +43,7 @@ public class TableDataTree extends UserObjectRefreshJTree { } // CellRenderer - private DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() { + private DefaultTreeCellRenderer tableDataTreeCellRenderer = new FineTreeCellRender() { private static final long serialVersionUID = 1L; @Override @@ -54,7 +53,7 @@ public class TableDataTree extends UserObjectRefreshJTree { Object userObj = treeNode.getUserObject(); if (userObj instanceof String) { // p:这个是column field. - this.setIcon(IconUtils.readIcon("/com/fr/design/standard/field")); + this.setIcon(new LazyIcon("field")); this.setText((String) userObj); } else if (userObj instanceof NameObject) { NameObject nameObject = (NameObject) userObj; @@ -72,16 +71,12 @@ public class TableDataTree extends UserObjectRefreshJTree { this.setIcon(IconUtils.readIcon(IconPathConstants.DS_QUERY_ICON_PATH)); } } else { - this.setIcon(IconUtils.readIcon("/com/fr/design/images/data/store_procedure.png")); + this.setIcon(new LazyIcon("store_procedure")); } } else if (userObj == PENDING) { this.setIcon(null); this.setText(PENDING.toString()); } - this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0)); - this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND); - this.setTextSelectionColor(Color.WHITE); - this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE); return this; } }; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 149fa87dc2..0c072ba033 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -1,5 +1,7 @@ package com.fr.design.data.datapane; +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.TableData; import com.fr.data.MultiResultTableData; import com.fr.data.TableDataSource; @@ -9,7 +11,6 @@ import com.fr.design.DesignModelAdapter; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.UpdateAction; -import com.fr.design.constants.UIConstants; import com.fr.design.data.BasicTableDataTreePane; import com.fr.design.data.BasicTableDataUtils; import com.fr.design.data.DesignTableDataManager; @@ -69,17 +70,16 @@ import com.fr.stable.core.PropertyChangeAdapter; import com.fr.workspace.WorkContext; import org.jetbrains.annotations.NotNull; -import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; import javax.swing.ToolTipManager; +import javax.swing.border.EmptyBorder; import javax.swing.tree.TreePath; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Dimension; import java.awt.GridLayout; import java.awt.dnd.DnDConstants; import java.awt.event.ActionEvent; @@ -97,6 +97,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; +import static com.fine.theme.utils.FineUIScale.scale; + public class TableDataTreePane extends BasicTableDataTreePane { private static final TableDataTreePane singleton = new TableDataTreePane(); @@ -183,7 +185,6 @@ public class TableDataTreePane extends BasicTableDataTreePane { popupMenu.add(copyAction.createMenuItem()); popupMenu.add(pasteAction.createMenuItem()); popupMenu.add(removeAction.createMenuItem()); - popupMenu.addSeparator(); // 监听 tableDataTree.addMouseListener(new MouseAdapter() { @Override @@ -229,7 +230,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { private TreeSearchToolbarPane initToolBarPane() { // toolbar addMenuDef = new MenuDef(Toolkit.i18nText("Fine-Design_Basic_Action_Add")); - addMenuDef.setDisabledIcon("/com/fr/design/standard/addpopup/addPopup", true); + addMenuDef.setIcon(new LazyIcon("add_popup")); createAddMenuDef(); // 创建插件监听 createPluginListener(); @@ -247,14 +248,10 @@ public class TableDataTreePane extends BasicTableDataTreePane { toolbarDef = new ToolBarDef(); toolbarDef.addShortCut(addMenuDef, SeparatorDef.DEFAULT, editAction, removeAction, SeparatorDef.DEFAULT, previewTableDataAction, connectionTableAction, esdAction, esdOffAction, switchAction); UIToolbar toolBar = ToolBarDef.createJToolBar(); - toolBar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.TOOLBAR_BORDER_COLOR)); toolBar.setBorderPainted(true); toolbarDef.updateToolBar(toolBar); - TreeSearchToolbarPane searchLayerdPane = new TreeSearchToolbarPane(toolBar); - searchLayerdPane.setPreferredSize(new Dimension(this.getWidth(), 23)); - - return searchLayerdPane; + return new TreeSearchToolbarPane(toolBar); } /** @@ -263,7 +260,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { * @return */ private JPanel initTreePane() { - JPanel treePane = new JPanel(new BorderLayout(0, 6)); + JPanel treePane = new JPanel(new BorderLayout(0, scale(6))); // north JPanel northPane = new JPanel(FRGUIPaneFactory.createBorderLayout()); initServerDatasetAuthTipJPanel(); @@ -275,6 +272,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { treePane.add(northPane, BorderLayout.NORTH); treePane.add(remindPane, BorderLayout.CENTER); + treePane.setBorder(new ScaledEmptyBorder(4, 10, 10, 10)); return treePane; } @@ -813,7 +811,6 @@ public class TableDataTreePane extends BasicTableDataTreePane { return false; } }; - buttonGroup.setNeedLeftRightOutLine(false); } @@ -895,7 +892,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { @Override public String getIconResource() { - return "/com/fr/design/standard/batchesdon/batch_esd_on"; + return "batch_esd_on"; } @Override @@ -942,7 +939,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { @Override public String getIconResource() { - return "/com/fr/design/standard/batchesdoff/batch_esd_off"; + return "batch_esd_off"; } @Override @@ -970,7 +967,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { public AbstractESDAction() { this.setName(getName()); this.setMnemonic('R'); - this.setSmallIcon(getIconResource()); + this.setSmallIcon(new LazyIcon(getIconResource())); } @Override @@ -1036,7 +1033,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { public EditAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Edit")); this.setMnemonic('E'); - this.setSmallIcon("/com/fr/design/standard/editdataset/edit"); + this.setSmallIcon(new LazyIcon("edit")); } @Override @@ -1101,7 +1098,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { public RemoveAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Remove")); this.setMnemonic('R'); - this.setSmallIcon("/com/fr/design/standard/remove/remove"); + this.setSmallIcon(new LazyIcon("remove")); } @Override @@ -1177,7 +1174,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { public CopyAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Copy")); this.setMnemonic('C'); - this.setSmallIcon("/com/fr/design/standard/copy/copy"); + this.setSmallIcon(new LazyIcon("copy")); } @Override @@ -1193,7 +1190,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { public PasteAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Action_Paste_Name")); this.setMnemonic('P'); - this.setSmallIcon("/com/fr/design/images/m_edit/paste"); + this.setSmallIcon(new LazyIcon("paste")); } @Override @@ -1227,7 +1224,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { public SwitchAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Search")); this.setMnemonic('S'); - this.setSmallIcon("/com/fr/design/standard/search", false); + this.setSmallIcon(new LazyIcon("search")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java index 175ddbfda3..45d80279ae 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java @@ -1,6 +1,7 @@ package com.fr.design.data.datapane; import com.fr.data.impl.RecursionTableData; +import com.fr.design.constants.LayoutConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.preview.PreviewLabel; import com.fr.design.data.datapane.preview.PreviewLabel.Previewable; @@ -18,19 +19,22 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.JPanel; -import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.fix; + public class TreeTableDataDictPane extends BasicPane implements Previewable { private UILabel selectTableDataLabel; @@ -48,29 +52,34 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { private ValueEditorPane originFieldDependsOnParentPane; private ValueEditorPane parentFieldPane; private ValueEditorPane originFieldDependsOnLengthPane; + private static final double TITLE_RATIO = 0.2; public TreeTableDataDictPane() { this(StringUtils.EMPTY); } public TreeTableDataDictPane(String treeName) { - this.setLayout(new BorderLayout(5, 30)); - this.setBorder(BorderFactory.createEmptyBorder(20, 20, 0, 0)); - selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One") + " :"); + this.setLayout(new BorderLayout()); + //请选择一个数据集 + selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One") ); setTableDataNameComboBox(treeName); - tableDataNameComboBox.setPreferredSize(new Dimension(180, 20)); - JPanel tableFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - tableFlowPane.add(selectTableDataLabel); - tableFlowPane.add(tableDataNameComboBox); tableDataNameComboBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { tdChange(true); } }); - tableFlowPane.add(new PreviewLabel(this)); - this.add(tableFlowPane, BorderLayout.NORTH); + JPanel tableFlowPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + tableFlowPane.add(row( + cell(selectTableDataLabel).weight(TITLE_RATIO), + row(LayoutConstants.HGAP_LARGE, + cell(tableDataNameComboBox).weight(1), + cell(new PreviewLabel(this)) + ).weight(0.4), + flex(0.6 - TITLE_RATIO) + ).getComponent()); + + //中心面板 JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(centerPane, BorderLayout.CENTER); parentMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Tree_Accord_Parent_Marked_Filed"), true); lengthMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Tree_Accord_Marked_Filed_Length")); parentMarkRadio.addItemListener(new ItemListener() { @@ -95,45 +104,48 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { markButtonGroup.add(parentMarkRadio); markButtonGroup.add(lengthMarkRadio); - originFieldDependsOnParentLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed") + " :", SwingConstants.RIGHT); - parentFieldLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parent_Marked_Field") + " :", SwingConstants.RIGHT); - treeDataFieldLabel1 = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field") + " :", SwingConstants.RIGHT); - originFieldDependsOnLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed") + " :", SwingConstants.RIGHT); - treeDataFieldLabel2 = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field") + " :", SwingConstants.RIGHT); + //原始标记字段 + originFieldDependsOnParentLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed")); + //父标记字段 + parentFieldLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parent_Marked_Field")); + treeDataFieldLabel1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field")); + originFieldDependsOnLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed")); + treeDataFieldLabel2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field")); -// originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); -// parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); -// originFieldDependsOnLengthPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); originFieldDependsOnLengthPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); - makeParentEnable(); - JPanel p1 = createCenterFlowZeroGapBorderPane(originFieldDependsOnParentLabel, originFieldDependsOnParentPane); - JPanel p2 = createCenterFlowZeroGapBorderPane(parentFieldLabel, parentFieldPane); - JPanel border1 = new JPanel(); - border1.setLayout(new BorderLayout(0, 10)); - border1.add(p1, BorderLayout.NORTH); - border1.add(p2, BorderLayout.CENTER); - JPanel p4 = createCenterFlowZeroGapBorderPane(originFieldDependsOnLengthLabel, originFieldDependsOnLengthPane); - JPanel border2 = new JPanel(); - border2.setLayout(new BorderLayout(0, 20)); - border2.add(p4, BorderLayout.NORTH); + //树数据集面板 + centerPane.add(column( + cell(parentMarkRadio), + fix(10), + row( + cell(originFieldDependsOnParentLabel).weight(TITLE_RATIO), + cell(originFieldDependsOnParentPane).weight(0.4), + flex(0.6 - TITLE_RATIO) + ), + fix(6), + row( + cell(parentFieldLabel).weight(TITLE_RATIO), + cell(parentFieldPane).weight(0.4), + flex(0.6 - TITLE_RATIO) + ), + fix(20), + cell(lengthMarkRadio), + fix(10), + row( + cell(originFieldDependsOnLengthLabel).weight(TITLE_RATIO), + cell(originFieldDependsOnLengthPane).weight(0.4), + flex(0.6 - TITLE_RATIO) + ) + ).getComponent()); - JPanel xx = FRGUIPaneFactory.createBorderLayout_S_Pane(); - xx.add(parentMarkRadio, BorderLayout.NORTH); - xx.add(border1, BorderLayout.CENTER); - JPanel xxx = FRGUIPaneFactory.createBorderLayout_S_Pane(); - xxx.add(lengthMarkRadio, BorderLayout.NORTH); - xxx.add(border2, BorderLayout.CENTER); - JPanel buildTreePanel = new JPanel(new BorderLayout(5, 30)); - buildTreePanel.add(xx, BorderLayout.NORTH); - buildTreePanel.add(xxx, BorderLayout.CENTER); - centerPane.add(buildTreePanel, BorderLayout.NORTH); - JPanel previewPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); + //预览 + JPanel previewPanel = new JPanel(new BorderLayout()); UIButton treeDataPreviewButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); - previewPanel.add(treeDataPreviewButton); + previewPanel.add(treeDataPreviewButton, BorderLayout.WEST); treeDataPreviewButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -163,7 +175,8 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { PreviewTablePane.previewTableData(rtd); } }); - centerPane.add(previewPanel, BorderLayout.CENTER); + + this.add(column(LayoutConstants.VGAP_HUGER, cell(tableFlowPane),cell(centerPane), cell(previewPanel)).getComponent()); } protected void setTableDataNameComboBox(String treeName) { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java index 374efb1121..fd43af24f0 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java @@ -1,23 +1,22 @@ package com.fr.design.data.datapane; +import com.fine.swing.ui.layout.Layouts; import com.fr.design.constants.LayoutConstants; import com.fr.design.data.datapane.preview.PreviewLabel; import com.fr.design.data.datapane.preview.PreviewLabel.Previewable; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerBean; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.design.utils.gui.UIComponentUtils; import com.fr.design.widget.FRWidgetFactory; -import javax.swing.*; import java.awt.*; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + public class VerticalChoosePane extends ChoosePane implements DesignerBean { - private static final int RIGHTBORDER = 5; private static final int MAX_WIDTH = 60; public VerticalChoosePane(Previewable previewable) { @@ -31,35 +30,23 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean { @Override protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p, p}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; - JPanel rs = new JPanel(new BorderLayout(0, 0)); - rs.add(tableNameComboBox, BorderLayout.CENTER); - rs.add(GUICoreUtils.createFlowPane(new Component[]{new RefreshLabel(this), previewLabel}, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST); - rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER)); UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"), UILabel.LEFT); UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), UILabel.LEFT); UILabel l3 = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), MAX_WIDTH, UILabel.LEFT); - if (labelSize > 0) { - Dimension pSize = new Dimension(labelSize, 20); - l1.setPreferredSize(pSize); - l2.setPreferredSize(pSize); - l3.setPreferredSize(pSize); - } - - Component[][] components = new Component[][]{ - new Component[]{l1, dsNameComboBox}, - new Component[]{l2, schemaBox}, - new Component[]{l3, UIComponentUtils.wrapWithBorderLayoutPane(rs)} - }; - JPanel content = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_HUGER, LayoutConstants.VGAP_LARGE); this.setLayout(new BorderLayout()); - this.add(content, BorderLayout.CENTER); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + row(cell(l1).weight(1), cell(dsNameComboBox).weight(2)), + row(cell(l2).weight(1), cell(schemaBox).weight(2)), + row( + cell(l3).weight(1), + cell(tableNameComboBox).weight(1.2), + flex(0.1), + cell(new RefreshLabel(this)).weight(0.3), + flex(0.1), + cell(previewLabel).weight(0.3)) + ).getComponent(), BorderLayout.CENTER); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java index 7784aa5712..a2aadbb030 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java @@ -1,55 +1,69 @@ package com.fr.design.data.datapane.connect; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.utils.FineUIUtils; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.pool.DBCPConnectionPoolAttr; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.editor.editor.IntegerEditor; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.stable.StringUtils; -import javax.swing.JPanel; import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Component; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; + /** * @author xiqiu * @date 2021/11/22 * @description */ public class AdvancePane extends BasicPane { - private IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor(); - private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")}); - private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor(); - private SpecialUITextField DBCP_VALIDATION_QUERY = new SpecialUITextField(); + private final IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor(); + private final UIComboBox DBCP_TEST_ON_BORROW = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), + Toolkit.i18nText("Fine-Design_Basic_Yes")}); + private final IntegerEditor DBCP_MAX_WAIT = new IntegerEditor(); + private final SpecialUITextField DBCP_VALIDATION_QUERY = new SpecialUITextField(); public AdvancePane() { - JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); DBCP_VALIDATION_QUERY.addFocusListener(new JTextFieldHintListener(DBCP_VALIDATION_QUERY)); - double p = TableLayout.PREFERRED; DBCP_VALIDATION_QUERY.setColumns(20); - double[] rowSizeDbcp = {p, p, p, p}; - double[] columnDbcp = {190, p}; - Component[][] comps = { - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT} - }; - - JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSizeDbcp, columnDbcp, 11, 11); - jPanel.add(contextPane, BorderLayout.CENTER); - this.add(jPanel); + this.setLayout(new BorderLayout()); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Advanced"))).with(FineUIUtils::wrapBoldLabelWithUnderline), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active"), SwingConstants.LEFT)).weight(1), + cell(DBCP_MAX_ACTIVE).weight(1.5), + flex(2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query"), SwingConstants.LEFT)).weight(1), + cell(DBCP_VALIDATION_QUERY).weight(1.5), + flex(2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow"), SwingConstants.LEFT)).weight(1), + cell(DBCP_TEST_ON_BORROW).weight(1.5), + flex(2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time"), SwingConstants.LEFT)).weight(1), + cell(DBCP_MAX_WAIT).weight(1.5), + flex(2) + ) + + ).getComponent(), BorderLayout.CENTER); } @@ -62,7 +76,7 @@ public class AdvancePane extends BasicPane { this.DBCP_MAX_ACTIVE.setValue(dbcpAttr.getMaxActive()); this.DBCP_MAX_WAIT.setValue(dbcpAttr.getMaxWait()); this.DBCP_VALIDATION_QUERY.setText(dbcpAttr.getValidationQuery()); - this.DBCP_TESTONBORROW.setSelectedIndex(dbcpAttr.isTestOnBorrow() ? 1 : 0); + this.DBCP_TEST_ON_BORROW.setSelectedIndex(dbcpAttr.isTestOnBorrow() ? 1 : 0); } @@ -75,7 +89,7 @@ public class AdvancePane extends BasicPane { dbcpAttr.setMaxActive(this.DBCP_MAX_ACTIVE.getValue().intValue()); dbcpAttr.setMaxWait(this.DBCP_MAX_WAIT.getValue().intValue()); dbcpAttr.setValidationQuery(this.DBCP_VALIDATION_QUERY.getText()); - dbcpAttr.setTestOnBorrow(this.DBCP_TESTONBORROW.getSelectedIndex() == 0 ? false : true); + dbcpAttr.setTestOnBorrow(this.DBCP_TEST_ON_BORROW.getSelectedIndex() != 0); } @Override @@ -84,8 +98,8 @@ public class AdvancePane extends BasicPane { } - private class JTextFieldHintListener implements FocusListener { - private SpecialUITextField textField; + private static class JTextFieldHintListener implements FocusListener { + private final SpecialUITextField textField; public JTextFieldHintListener(SpecialUITextField jTextField) { this.textField = jTextField; @@ -108,7 +122,7 @@ public class AdvancePane extends BasicPane { } } - private class SpecialUITextField extends UITextField { + private static class SpecialUITextField extends UITextField { @Override public String getText() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java index 3067aeacb3..4be579742a 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java @@ -1,6 +1,7 @@ package com.fr.design.data.datapane.connect; import com.fanruan.config.impl.data.ConnectionConfigProviderFactory; +import com.fine.theme.icon.LazyIcon; import com.fr.base.svg.IconUtils; import com.fr.data.impl.AbstractDatabaseConnection; import com.fr.data.impl.Connection; @@ -63,7 +64,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel { protected UIButton initEditButton(UIButton editButton, Dimension buttonSize) { editButton = new UILockButton( EditLockUtils.CONNECTION_LOCKED_ICON, - IconUtils.readIcon("/com/fr/design/images/m_web/connection"), + new LazyIcon("connection"), EditLockUtils.CONNECTION_LOCKED_TOOLTIPS, null ); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java index d1e85492d1..08a7fbabf1 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -6,6 +6,9 @@ import com.fr.config.remote.RemoteConfigEvent; import com.fr.data.auth.AuthenticationType; import com.fr.data.auth.kerberos.KerberosAuthentication; import com.fr.data.auth.kerberos.KerberosUtils; +import com.fine.theme.icon.LazyIcon; +import com.fr.config.RemoteConfigEvent; +import com.fr.data.driver.DriverClassNotFoundException; import com.fr.data.impl.Connection; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.impl.JNDIDatabaseConnection; @@ -171,16 +174,12 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh */ public NameableCreator[] createNameableCreators() { NameObjectCreator jdbc = new NameObjectCreator( - "JDBC", - "/com/fr/design/images/data/source/jdbcTableData.png", - JDBCDatabaseConnection.class, - DatabaseConnectionPane.JDBC.class + "JDBC", new LazyIcon("dataLink"), + JDBCDatabaseConnection.class, DatabaseConnectionPane.JDBC.class ); NameObjectCreator jndi = new NameObjectCreator( - "JNDI", - "/com/fr/design/images/data/source/jdbcTableData.png", - JNDIDatabaseConnection.class, - DatabaseConnectionPane.JNDI.class + "JNDI", new LazyIcon("dataLink"), + JNDIDatabaseConnection.class, DatabaseConnectionPane.JNDI.class ); NameableCreator[] creators; if (WorkContext.getCurrent().get(DataBaseTypeOperator.class).limitDatabaseType()) { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java index 79e75a0b83..4d8540fe95 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java @@ -1,13 +1,15 @@ package com.fr.design.data.datapane.connect; -import com.fr.base.BaseUtils; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.core.db.TableProcedure; import com.fr.data.impl.AbstractDatabaseConnection; import com.fr.data.impl.Connection; import com.fr.design.border.UIRoundedBorder; import com.fr.design.constants.UIConstants; -import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane; import com.fr.design.data.tabledata.tabledatapane.loading.SwitchableTableDataPane; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; @@ -24,6 +26,7 @@ import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; import javax.swing.JPanel; import javax.swing.ToolTipManager; +import javax.swing.UIManager; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import java.awt.BorderLayout; @@ -36,6 +39,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 数据集编辑面板左边的部分 * @@ -64,19 +70,19 @@ public class ConnectionTableProcedurePane extends BasicPane { } private void init(SwitchableTableDataPane parent) { - this.setLayout(new BorderLayout(4, 4)); + this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(4, 10)); // 初始化数据连接下拉框 initConnectionComboBox(parent); // 初始化中间的面板 JPanel centerPane = initCenterPane(); this.add(connectionComboBox, BorderLayout.NORTH); this.add(centerPane, BorderLayout.CENTER); - this.setPreferredSize(new Dimension(WIDTH, getPreferredSize().height)); + this.setPreferredSize(new Dimension(FineUIScale.scale(WIDTH), getPreferredSize().height)); addKeyMonitor(); } private JPanel initCenterPane() { - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + JPanel centerPane = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(0, 6); // 搜索面板 centerPane.add(createSearchPane(), BorderLayout.NORTH); // 数据库表视图面板 @@ -146,8 +152,8 @@ public class ConnectionTableProcedurePane extends BasicPane { } }); UIScrollPane tableViewListPane = new UIScrollPane(tableViewList); - tableViewListPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); - JPanel tableViewBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + tableViewListPane.setBorder(new UIRoundedBorder(UIManager.getColor("defaultBorderColor"), 1, UIConstants.ARC)); + JPanel tableViewBorderPane = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(0, 10); tableViewBorderPane.add(tableViewListPane, BorderLayout.CENTER); JPanel checkBoxgroupPane = createCheckBoxgroupPane(); if (checkBoxgroupPane != null) { @@ -162,32 +168,15 @@ public class ConnectionTableProcedurePane extends BasicPane { */ private JPanel createSearchPane() { JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - JPanel searchPane = new JPanel(new BorderLayout(10, 0)); - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR)); - searchPane.setBackground(Color.WHITE); searchField = new UITextField(); - searchField.setBorderPainted(false); searchField.setPlaceholder(Toolkit.i18nText("Fine-Design_Basic_Table_Search")); searchField.getDocument().addDocumentListener(searchListener); - searchField.addMouseListener(new MouseAdapter() { - @Override - public void mouseEntered(MouseEvent e) { - super.mouseEntered(e); - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.CHECKBOX_HOVER_SELECTED)); - } - - @Override - public void mouseExited(MouseEvent e) { - super.mouseExited(e); - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR)); - } - }); // 搜索图标 - UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/search")); - searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); - searchPane.add(searchField, BorderLayout.CENTER); - searchPane.add(searchLabel, BorderLayout.EAST); - panel.add(searchPane, BorderLayout.CENTER); + UILabel searchLabel = new UILabel(new LazyIcon("search")); + searchLabel.setBorder(new ScaledEmptyBorder(0, 3, 0, 3)); + searchField.setBorder(null); + panel.add(row(cell(searchLabel), cell(searchField).weight(1)).with(it -> it.setBorder(new FineRoundBorder())).getComponent()); + panel.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); return panel; } @@ -200,35 +189,35 @@ public class ConnectionTableProcedurePane extends BasicPane { } protected JPanel createCheckBoxgroupPane() { - JPanel checkBoxgroupPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); - JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + JPanel checkBoxgroupPane = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(30, 2); + JPanel first = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(2, 0); tableCheckBox = new UICheckBox(); tableCheckBox.setSelected(true); tableCheckBox.addActionListener(filter); - first.add(tableCheckBox); + first.add(tableCheckBox, BorderLayout.WEST); - JPanel second = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + JPanel second = FRGUIPaneFactory.createScaledBorderLayout_S_Pane(4, 0); viewCheckBox = new UICheckBox(); viewCheckBox.setSelected(true); viewCheckBox.addActionListener(filter); - second.add(viewCheckBox); + second.add(viewCheckBox, BorderLayout.WEST); // 根据环境是否为中文设置不同的显示 if (GeneralContext.isChineseEnv()) { first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"), - BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING)); + new LazyIcon("tables"), UILabel.LEADING)); second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"), - BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING)); + new LazyIcon("views"), UILabel.LEADING)); } else { - UILabel ui1 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING); - UILabel ui2 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING); + UILabel ui1 = new UILabel(new LazyIcon("tables"), UILabel.LEADING); + UILabel ui2 = new UILabel(new LazyIcon("views"), UILabel.LEADING); ui1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table")); ui2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View")); first.add(ui1); second.add(ui2); } - checkBoxgroupPane.add(first); - checkBoxgroupPane.add(second); + checkBoxgroupPane.add(first, BorderLayout.WEST); + checkBoxgroupPane.add(second, BorderLayout.CENTER); return checkBoxgroupPane; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java index ebfd195d8e..5d54d907ee 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java @@ -1,9 +1,13 @@ package com.fr.design.data.datapane.connect; -import com.fr.base.GraphHelper; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.core.db.dialect.DialectFactory; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.pool.DBCPConnectionPoolAttr; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.editor.editor.IntegerEditor; @@ -11,19 +15,13 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; import javax.swing.JPanel; import javax.swing.JTextField; -import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; import java.awt.Window; import java.awt.event.InputMethodEvent; import java.awt.event.InputMethodListener; @@ -36,6 +34,10 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; + public class DBCPAttrPane extends BasicPane { public static final int TIME_MULTIPLE = 1000; private static final Pattern FETCHSIZE_PATTERN = Pattern.compile("^0$|^[1-9][\\d]*[\\d]*$");; @@ -70,37 +72,44 @@ public class DBCPAttrPane extends BasicPane { } public DBCPAttrPane() { - defaultPane = this; - + this.setLayout(new BorderLayout()); + defaultPane = Layouts.column(20) + .with(it -> it.setBorder(new ScaledEmptyBorder(10, 10, 10, 10))).getComponent(); // JPanel northFlowPane - northFlowPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr")); - northFlowPane.setPreferredSize(new Dimension(630, 330)); - defaultPane.add(northFlowPane, BorderLayout.NORTH); - - // ContextPane - - double f = TableLayout.FILL; - // double p = TableLayout.PREFERRED; - double[] rowSize = {f, f, f, f, f, f, f}; - double[] columnSize = {f, f}; - Component[][] comps = { - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT), - DBCP_TIMEBETWEENEVICTIONRUNSMILLS}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN}, - {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":", SwingConstants.RIGHT), - DBCP_MINEVICTABLEIDLETIMEMILLIS}}; - - JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 10); - northFlowPane.add(contextPane); - JPanel boxFlowInnerContainer = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 5); - UILabel uiLabel = new UILabel(Toolkit.i18nText("Fine-Design_Dbcp_Warning")); - uiLabel.setForeground(Color.RED); - boxFlowInnerContainer.add(uiLabel); - northFlowPane.add(boxFlowInnerContainer); + northFlowPane = Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"))).with(FineUIUtils::wrapBoldLabelWithUnderline), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size"))).weight(1), + cell(DBCP_INITIAL_SIZE).weight(1), flex(1.2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle"))).weight(1), + cell(DBCP_MIN_IDLE).weight(1), flex(1.2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return"))).weight(1), + cell(DBCP_TESTONRETURN).weight(1), flex(1.2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle"))).weight(1), + cell(DBCP_TESTWHILEIDLE).weight(1), flex(1.2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis"))).weight(1), + cell(DBCP_TIMEBETWEENEVICTIONRUNSMILLS).weight(1), flex(1.2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run"))).weight(1), + cell(DBCP_NUMTESTSPEREVICTIONRUN).weight(1), flex(1.2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis"))).weight(1), + cell(DBCP_MINEVICTABLEIDLETIMEMILLIS).weight(1), flex(1.2) + ), + cell(new UILabel(Toolkit.i18nText("Fine-Design_Dbcp_Warning"))).with(it -> it.setForeground(FlatUIUtils.getUIColor("Label.strongHintColor", Color.RED))) + ).getComponent(); + defaultPane.add(northFlowPane); + this.add(defaultPane); } public void populate(JDBCDatabaseConnection jdbcDatabase) { @@ -188,24 +197,18 @@ public class DBCPAttrPane extends BasicPane { public BasicDialog showWindow(Window window) { String databaseName = JDBCConnectionDef.getInstance().getDatabaseName(); if (showOtherConfig(databaseName)) { - southFlowPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Other")); - southFlowPane.setPreferredSize(new Dimension(630, 200)); - double f = TableLayout.FILL; - double[] rowSize = {f}; - double otherColumnSize = GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis")) + 6; - double[] columnSize = {otherColumnSize, otherColumnSize}; FETCHSIZE.addKeyListener(fetchSizeKeyListener); FETCHSIZE.addInputMethodListener(fetchSizeInputMethodListener); - FETCHSIZE.setHorizontalAlignment(JTextField.RIGHT); - Component[][] comps = { - {new UILabel("Fetchsize:", SwingConstants.RIGHT), FETCHSIZE} - }; - JPanel otherConfigPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4); - southFlowPane.add(otherConfigPane); + southFlowPane = Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_Other"))).with(FineUIUtils::wrapBoldLabelWithUnderline), + row( + cell(new UILabel("Fetchsize")).weight(1), cell(FETCHSIZE).weight(1), flex(1.2) + ) + ).getComponent(); defaultPane.removeAll(); - defaultPane.add(northFlowPane, BorderLayout.NORTH); - defaultPane.add(southFlowPane, BorderLayout.SOUTH); + defaultPane.add(northFlowPane); + defaultPane.add(southFlowPane); } else { if (southFlowPane != null) { defaultPane.remove(southFlowPane); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index 6220903adb..abc1decc5f 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -3,6 +3,12 @@ */ package com.fr.design.data.datapane.connect; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.driver.util.JarFileParseUtil; import com.fr.data.impl.Connection; import com.fr.data.impl.JDBCDatabaseConnection; @@ -15,14 +21,15 @@ import com.fr.data.solution.processor.ClassNotFoundExceptionSolutionProcessor; import com.fr.data.solution.processor.SolutionProcessor; import com.fr.design.beans.BasicBeanPane; import com.fr.design.data.datapane.preview.ConnectionInfoBeanHelper; +import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; import com.fr.rpc.ExceptionHandler; import com.fr.rpc.RPCInvokerExceptionInfo; @@ -30,11 +37,10 @@ import com.fr.stable.ArrayUtils; import com.fr.stable.EncodeConstants; import com.fr.stable.StringUtils; import com.fr.workspace.WorkContext; +import org.jetbrains.annotations.NotNull; import com.fr.workspace.server.entity.connection.ConnectionBean; import com.fr.workspace.server.repository.connection.ConnectionRepository; -import javax.swing.BorderFactory; -import javax.swing.BoxLayout; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPanel; @@ -65,6 +71,12 @@ import java.io.File; import java.net.URI; import java.util.concurrent.ExecutionException; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle; + /** * Database Connection pane. */ @@ -127,14 +139,14 @@ public abstract class DatabaseConnectionPane it.setBorder(new ScaledEmptyBorder(0, 10, 0, 10))) + .getComponent(); + JPanel columnContainer = new JPanel(new BorderLayout()); + columnContainer.add(corePane); + UIScrollPane uiScrollPane = new UIScrollPane(columnContainer, + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); this.add(uiScrollPane, BorderLayout.CENTER); - // 按钮. - JPanel testPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - northPane.add(testPane, BorderLayout.NORTH); - UIButton testButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection")); - testPane.add(testButton); - testButton.addActionListener(testConnectionActionListener); - testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4)); + // 按钮 + JPanel testButtonPane = initTestButtonPane(); + corePane.add(testButtonPane); // Center mainPanel = mainPanel(); - JPanel advancedPanel = FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_Advanced")); + JPanel advancedPanel = Layouts.column(LayoutConstants.VERTICAL_GAP).getComponent(); if (mainPanel instanceof JDBCDefPane) { - northPane.add(mainPanel, BorderLayout.CENTER); - ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Advanced_More_Settings")); - actionLabel.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent evt) { - JDialog wDialog = createJDialog(); - if (wDialog != null) { - wDialog.setVisible(true); - } - } - }); - JPanel actionLabelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - actionLabelPanel.setBorder(BorderFactory.createEmptyBorder(2, 4, 4, 20)); - actionLabelPanel.add(actionLabel, BorderLayout.WEST); - JPanel advancePane = getAdvancePane(); - if (advancePane != null) { - advancedPanel.add(advancePane); - } - advancedPanel.add(actionLabelPanel); - northPane.add(getSshPane()); - northPane.add(getSslPane()); + initJDBCLayout(corePane, advancedPanel); } else { - //非jdbc配置布局保持不变 - advancedPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, 60)); - if (mainPanel.getPreferredSize().height > MAX_MAIN_PANEL_HEIGHT || mainPanel.getPreferredSize().width > MAX_MAIN_PANEL_WIDTH) { - UIScrollPane jp = new - UIScrollPane(mainPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); - jp.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, MAX_MAIN_PANEL_HEIGHT)); - northPane.add(jp, BorderLayout.CENTER); - } else { - mainPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, MAX_MAIN_PANEL_HEIGHT)); - northPane.add(mainPanel, BorderLayout.CENTER); + initJNDILayout(corePane, advancedPanel); + } + corePane.add(advancedPanel); + } + + @NotNull + private JPanel initTestButtonPane() { + JPanel testPane = new JPanel(new BorderLayout()); + UIButton testButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection")); + testButton.addActionListener(testConnectionActionListener); + testPane.add(testButton, BorderLayout.WEST); + return testPane; + } + + private void initJNDILayout(JPanel corePane, JPanel advancedPanel) { + corePane.add(mainPanel); + // ChartSet + String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")}; + charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY)); + JPanel chartSetPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + chartSetPane.add(row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset"))).weight(0.15), + cell(charSetComboBox).weight(0.3), + flex(0.55) + ).getComponent()); + advancedPanel.add(wrapComponentWithTitle(chartSetPane, Toolkit.i18nText("Fine-Design_Basic_Advanced"))); + } + + private void initJDBCLayout(JPanel corePane, JPanel advancedPanel) { + corePane.add(mainPanel); + ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Advanced_More_Settings")); + actionLabel.addActionListener(evt -> { + JDialog wDialog = createJDialog(); + if (wDialog != null) { + wDialog.setVisible(true); } - // ChartSet - String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")}; - charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY)); - JPanel chartSetPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); - chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":")); - advancedPanel.add(chartSetPane); + }); + JPanel advancePane = getAdvancePane(); + if (advancePane != null) { + advancedPanel.add(advancePane); } - northPane.add(advancedPanel); + advancedPanel.add( + row(cell(actionLabel),flex()).getComponent()); + corePane.add(getSshPane()); + corePane.add(getSslPane()); } private JDialog createJDialog() { - return JDBC.getAdvancedAttrPane() != null ? JDBC.getAdvancedAttrPane().showWindow(SwingUtilities.getWindowAncestor(mainPanel)) : null; + return JDBC.getAdvancedAttrPane() != null ? + JDBC.getAdvancedAttrPane().showWindow(SwingUtilities.getWindowAncestor(mainPanel)) : null; } private void initDialogPane() { message.setText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection") + "..."); - message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); okButton.setEnabled(false); dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true); - dialog.setSize(new Dimension(380, 125)); + dialog.setSize(FineUIScale.scale(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.env.RemoteEnvPane.dialog"))); okButton.setEnabled(false); JPanel jp = new JPanel(); - JPanel upPane = new JPanel(); + JPanel upPane = new JPanel(new BorderLayout()); JPanel downPane = new JPanel(); - uiLabel = new UILabel(UIManager.getIcon("OptionPane.informationIcon")); - upPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 10)); - upPane.add(uiLabel); - upPane.add(message); - midPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 0)); - directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right")); + uiLabel = new UILabel(new LazyIcon("information", 20)); + upPane.add(Layouts.row(10, Layouts.cell(uiLabel), Layouts.cell(message), Layouts.flex()).getComponent(), BorderLayout.NORTH); + directUiLabel.setIcon(new LazyIcon("plus")); detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail")); detailLabel.setForeground(Color.BLUE); hiddenPanel.setLayout(new BorderLayout(2, 0)); - hiddenPanel.add(new JPanel(), BorderLayout.WEST); - hiddenPanel.add(new JPanel(), BorderLayout.EAST); - downPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 15, 9)); + downPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 8, 0)); downPane.add(okButton); downPane.add(cancelButton); - jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS)); - jp.add(upPane); - jp.add(midPane); - jp.add(hiddenPanel); - jp.add(downPane); + jp.setLayout(FRGUIPaneFactory.createScaledBorderLayout(0, 10)); + jp.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); + jp.add(Layouts.column(10, cell(upPane), row(10, fix(20), cell(midPane)), + row(10, fix(20), cell(hiddenPanel).weight(1)).weight(1)).getComponent(), BorderLayout.CENTER); + jp.add(downPane, BorderLayout.SOUTH); dialog.add(jp); dialog.setResizable(false); dialog.setLocationRelativeTo(SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this)); @@ -440,9 +459,9 @@ public abstract class DatabaseConnectionPane changeDriverRow(); + + private void changeDriverRow() { + if (isSelfDefine()) { + driverSelectRow.select("define").populate(); + } else if (ComparatorUtils.equals("sun.jdbc.odbc.JdbcOdbcDriver", driverComboBox.getSelectedItem())) { + driverSelectRow.select("odbc").populate(); + } else { + driverSelectRow.select("normal").populate(); } - }; + } + ActionListener dbtypeActionListener = new ActionListener() { @Override public void actionPerformed(ActionEvent evt) { @@ -162,27 +160,24 @@ public class JDBCDefPane extends JPanel { public JDBCDefPane() { initMap(); - this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":")); - this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); - JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - innerthis.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - this.add(innerthis); + this.setLayout(new BorderLayout()); dbtypeComboBox = new UIComboBox(); dbtypeComboBox.setName(DRIVER_TYPE); - for (int i = 0; i < dbtype.length; i++) { - dbtypeComboBox.addItem(dbtype[i]); + for (String s : dbtype) { + dbtypeComboBox.addItem(s); } dbtypeComboBox.addActionListener(dbtypeActionListener); dbtypeComboBox.setMaximumRowCount(10); + driverLoaderBox = new SpecialUIComboBox(); refreshDriverLoader(); - driverLoaderBox.setPreferredSize(new Dimension(200, driverLoaderBox.getPreferredSize().height)); driverLoaderBox.setEditable(false); + driverManageBox = new UIComboBox(); refreshDriverManage(true); driverManageBox.setEditable(false); driverManageBox.addActionListener(driverManageListener); - driverLoaderBox.setVisible(isSelfDefine()); + driverComboBox = new UIComboBox(); driverComboBox.setEditable(true); driverComboBox.addActionListener(driverListener); @@ -198,124 +193,117 @@ public class JDBCDefPane extends JPanel { userNameTextField.setName(USER_NAME); passwordTextField = new UIPasswordFieldWithFixedLength(15); dbtypeButton = new UIButton(); - dbtypeButton.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); - dbtypeButton.setPreferredSize(new Dimension(20, 20)); + dbtypeButton.setIcon(new LazyIcon("dot")); dbtypeButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL")); dbtypeButton.addActionListener(dbtypeButtonActionListener); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - JPanel dbtypePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - dbtypePane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Database") + ":"))); - Component[][] dbtypeComComponents = {{dbtypeComboBox}}; - double[] dbtypeRowSize = {p}; - double[] dbtypeColumnSize = {p}; - JPanel dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize); - - JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - driverPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Driver") + ":")); + JPanel dbTypeRow = row( + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Database")))).weight(1.2), + cell(dbtypeComboBox).weight(2), + flex(5.8) + ).getComponent(); + // 选择ODBC数据源的时候的提示链接 - JPanel odbcTipsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - odbcTipsLink = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")) { - @Override - public void paintComponent(Graphics _gfx) { - super.paintComponent(_gfx); - _gfx.setColor(Color.blue); - _gfx.drawLine(0, this.getHeight() - 1, GraphHelper.getWidth(this.getText()), this.getHeight() - 1); - } - }; - odbcTipsPane.add(odbcTipsLink); - odbcTipsLink.setPreferredSize(new Dimension(GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")), odbcTipsLink.getPreferredSize().height)); - odbcTipsLink.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent evt) { - String url = CloudCenter.getInstance().acquireUrlByKind("odbc.help"); - BrowseUtils.browser(url); - } + odbcTipsLink = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")); + odbcTipsLink.addActionListener(evt -> { + String url = CloudCenter.getInstance().acquireUrlByKind("odbc.help"); + BrowseUtils.browser(url); }); - driverManageLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Driver_Manage_Add_Driver")) { - @Override - public void paintComponent(Graphics _gfx) { - super.paintComponent(_gfx); - _gfx.setColor(Color.blue); - _gfx.drawLine(0, this.getHeight() - 1, GraphHelper.getWidth(this.getText()), this.getHeight() - 1); - } - }; - driverManageLabel.setPreferredSize(new Dimension(GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Driver_Manage_Add_Driver")), driverManageLabel.getPreferredSize().height)); - driverManageLabel.setVisible(isSelfDefine()); - driverManageLabel.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent evt) { - String url = CloudCenter.getInstance().acquireUrlByKind("driver.add.help"); - BrowseUtils.browser(url); - } + driverManageLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Driver_Manage_Add_Driver")); + driverManageLabel.addActionListener(evt -> { + String url = CloudCenter.getInstance().acquireUrlByKind("driver.add.help"); + BrowseUtils.browser(url); }); - odbcTipsPane.add(driverManageLabel); - odbcTipsPane.add(odbcTipsLink); - - JPanel driverComboBoxAndTips = new JPanel(new BorderLayout()); - JPanel normalFlowInnerContainer_s_pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 0); - normalFlowInnerContainer_s_pane.add(driverManageBox); - normalFlowInnerContainer_s_pane.add(driverComboBox); - normalFlowInnerContainer_s_pane.add(driverLoaderBox); - driverComboBoxAndTips.add(normalFlowInnerContainer_s_pane, BorderLayout.WEST); - driverComboBoxAndTips.add(odbcTipsPane, BorderLayout.CENTER); - - JPanel hostPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - hostPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host") + ":")); - Component[][] hostComComponents = {{hostTextField}}; - double[] hostRowSize = {p}; - double[] hostColumnSize = {p}; - JPanel hostComPane = TableLayoutHelper.createTableLayoutPane(hostComComponents, hostRowSize, hostColumnSize); - - JPanel portPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - portPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Port") + ":")); - Component[][] portComComponents = {{portTextField}}; - double[] portRowSize = {p}; - double[] portColumnSize = {p}; - JPanel portComPane = TableLayoutHelper.createTableLayoutPane(portComComponents, portRowSize, portColumnSize); - - JPanel dbNamePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - dbNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_DatabaseName") + ":")); - Component[][] dbNameComComponents = {{dbNameTextField}}; - double[] dbNameRowSize = {p}; - double[] dbNameColumnSize = {p}; - JPanel dbNameComPane = TableLayoutHelper.createTableLayoutPane(dbNameComComponents, dbNameRowSize, dbNameColumnSize); - - JPanel urlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - urlPane.add(new UILabel("URL:")); - Component[][] urlComComponents = {{urlTextField, dbtypeButton}}; - double[] urlRowSize = {p}; - double[] urlColumnSize = {f, 21}; - JPanel urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4); - - JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - userPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName") + ":")); - Component[][] userComComponents = {{userNameTextField, new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}}; - double[] userRowSize = {p}; - double[] userColumnSize = {f, p, f}; - JPanel userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4); + driverSelectRow = ReactiveCardPane.create() + .addSupplier("normal", () -> row( + cell(driverComboBox).weight(3), flex(2) + ).getComponent()) + .addSupplier("odbc", () -> row( + cell(driverComboBox).weight(3), flex(0.2), cell(odbcTipsLink).weight(1.8) + ).getComponent()) + .addSupplier("define", () -> row( + cell(driverLoaderBox).weight(3), cell(driverManageLabel).weight(2) + ).getComponent()); + changeDriverRow(); + + JPanel driverRow = row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Driver"))).weight(1.2), + cell(driverManageBox).weight(1.2), + flex(0.2), + cell(driverSelectRow).weight(4.6), + flex(1.8) + ).getComponent(); + + // 以下布局比例为对齐计算而出 + JPanel hostRow = row( + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Host")))).weight(1.2), + cell(hostTextField).weight(4.16), + flex(3.64) + ).getComponent(); + + JPanel portRow = row( + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Port")))).weight(1.2), + cell(portTextField).weight(4.16), + flex(3.64) + ).getComponent(); + + JPanel dbNameRow = row( + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_DatabaseName")))).weight(1.2), + cell(dbNameTextField).weight(4.16), + flex(3.64) + ).getComponent(); + + JPanel urlRow = row( + cell(new UILabel("URL")).weight(1.2), + cell(urlTextField).weight(5.6), + flex(0.1), + cell(dbtypeButton).weight(0.3), + flex(1.8) + ).getComponent(); + + JPanel userRow = row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName"))).weight(1.2), + cell(userNameTextField).weight(2.3), + flex(0.2), + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password"))).weight(1.2), + cell(passwordTextField).weight(2.3), + flex(1.8) + ).getComponent(); String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")}; charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY)); - JPanel chartSetPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - chartSetPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":")); - Component[][] charSetComComponents = {{charSetComboBox}}; - double[] charSetRowSize = {p}; - double[] charSetColumnSize = {f}; - JPanel charSetComPane = TableLayoutHelper.createTableLayoutPane(charSetComComponents, charSetRowSize, charSetColumnSize); + JPanel charSetRow = row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset"))).weight(1.2), + cell(charSetComboBox).weight(6), + flex(1.8) + ).getComponent(); //这边调整的话注意下面的changePane - allComponents = new Component[][]{{dbtypePane, dbtypeComPane}, {driverPane, driverComboBoxAndTips}, {hostPane, hostComPane}, - {portPane, portComPane}, {dbNamePane, dbNameComPane}, {userPane, userComPane}, - {chartSetPane, charSetComPane}, {urlPane, urlComPane}}; - partComponents = new Component[][]{{dbtypePane, dbtypeComPane}, {driverPane, driverComboBoxAndTips}, {urlPane, urlComPane}, - {userPane, userComPane}, {chartSetPane, charSetComPane}}; - double[] rowSize = {p, p, p, p, p, p, p, p}; - double[] columnSize = {p, f, 22}; - // REPORT-41450 Windows环境的jdk11下dpi为125%时会因为缩放导致显示问题，因此加个水平gap值 - centerPanel = TableLayoutHelper.createGapTableLayoutPane(allComponents, rowSize, columnSize, 6, 6); - innerthis.add(centerPanel); + centerPanel = ReactiveCardPane.create() + .addSupplier("all", () -> Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(dbTypeRow), + cell(driverRow), + cell(hostRow), + cell(portRow), + cell(dbNameRow), + cell(userRow), + cell(charSetRow), + cell(urlRow) + ).getComponent()) + .addSupplier("part", () -> Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(dbTypeRow), + cell(driverRow), + cell(urlRow), + cell(userRow), + cell(charSetRow) + ).getComponent()); + centerPanel.select("all").populate(); + + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(new UILabel("JDBC")).with(FineUIUtils::wrapBoldLabelWithUnderline), + cell(centerPanel) + ).getComponent()); } private void refreshDriverLoader() { @@ -365,17 +353,10 @@ public class JDBCDefPane extends JPanel { } private void changePane(Object dbType) { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f, 22}; if (ComparatorUtils.equals(dbType, OTHER_DB) || ComparatorUtils.equals(dbType, "Access") || ComparatorUtils.equals(dbType, "SQLite")) { - if (this.centerPanel.getComponentCount() != partComponents.length * 2) { - centerPanel.removeAll(); - TableLayoutHelper.addComponent2ResultPane(partComponents, new double[]{p, p, p, p, p}, columnSize, centerPanel); - } - } else if (this.centerPanel.getComponentCount() != allComponents.length * 2) { - centerPanel.removeAll(); - TableLayoutHelper.addComponent2ResultPane(allComponents, new double[]{p, p, p, p, p, p, p, p}, columnSize, centerPanel); + centerPanel.select("part").populate(); + } else { + centerPanel.select("all").populate(); } } @@ -488,8 +469,13 @@ public class JDBCDefPane extends JPanel { linkPanel.setVisible(DriverClasses.MYSQL.toString().equalsIgnoreCase((String) dbtypeComboBox.getSelectedItem()) && driverComboBox.getSelectedItem() != null && ComparatorUtils.equals(DriverClasses.MYSQL.getDriverClass(), driverComboBox.getSelectedItem().toString().trim())); - odbcTipsLink.setVisible(driverComboBox.getSelectedItem() != null - && ComparatorUtils.equals("sun.jdbc.odbc.JdbcOdbcDriver", driverComboBox.getSelectedItem().toString().trim())); // 选择的如果是ODBC就显示提示 + if (driverComboBox.getSelectedItem() != null + && ComparatorUtils.equals("sun.jdbc.odbc.JdbcOdbcDriver", driverComboBox.getSelectedItem().toString().trim())) { + driverSelectRow.select("odbc").populate(); + } else { + driverSelectRow.select("normal").populate(); + + } if (driverComboBox.getSelectedItem() == null || ComparatorUtils.equals(driverComboBox.getSelectedItem(), StringUtils.EMPTY)) { return; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java index e99d99ca4d..29a1636a09 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java @@ -1,38 +1,40 @@ package com.fr.design.data.datapane.connect; import java.awt.BorderLayout; -import java.awt.Component; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.HashMap; -import java.util.Hashtable; import java.util.Map; import java.util.Properties; import javax.naming.Context; -import javax.swing.BorderFactory; import javax.swing.JDialog; + +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.ilable.UILabel; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import com.fr.data.impl.JNDIDatabaseConnection; -import com.fr.design.border.UITitledBorder; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.FRExplainLabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.dialog.BasicPane; import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle; + public class JNDIDefPane extends JPanel { private static Map jndiMap = new HashMap(); @@ -66,57 +68,51 @@ public class JNDIDefPane extends JPanel { private JDialog otherAttrDialog; public JNDIDefPane() { - this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); - this.setBorder(UITitledBorder.createBorderWithTitle("JNDI" + ":")); - JPanel innerthis = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - this.add(innerthis); - // NorthPane - JPanel nContentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - innerthis.add(nContentPane); - nContentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_Name") + ":")); - jndiNameTextField = new UITextField(20); - nContentPane.add(jndiNameTextField, BorderLayout.NORTH); - - // CenterPane - JPanel outcenterPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Context")); - innerthis.add(outcenterPane); - JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); - outcenterPane.add(centerPane); + this.setLayout(new BorderLayout()); + jndiNameTextField = new UITextField(20); JNDIFactoryComboBox = new UIComboBox(new String[] { "", "weblogic.jndi.WLInitialContextFactory", "com.ibm.websphere.naming.WsnInitialContextFactory", "org.jboss.naming.HttpNamingContextFactory", "org.jnp.interfaces.NamingContextFactory", "com.caucho.burlap.BurlapContextFactory", }); JNDIFactoryComboBox.setEditable(true); - JNDIFactoryComboBox.addActionListener(jndiListener); - JNDIFactoryComboBox.setPreferredSize(new Dimension(30, JNDIFactoryComboBox.getPreferredSize().height + 2)); - - // ContextPane - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] rowSize = { p, p, p, p }; - double[] columnSize = { f, f }; - Component[][] comps = { { new UILabel("INITIAL_CONTEXT_FACTORY:", SwingConstants.RIGHT), JNDIFactoryComboBox }, - { new UILabel("PROVIDER_URL:", SwingConstants.RIGHT), PROVIDER_URL_TF }, { new UILabel("SECURITY_PRINCIPAL:", SwingConstants.RIGHT), SECURITY_PRINCIPAL_TF }, - { new UILabel("SECURITY_CREDENTIALS:", SwingConstants.RIGHT), SECURITY_CREDENTIALS_TF } }; - centerPane.add(TableLayoutHelper.createCommonTableLayoutPane(comps, rowSize, columnSize, 2)); - - // ActionLabel - JPanel actionPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.add(actionPane); - actionPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 4, 6)); - + JNDIFactoryComboBox.setPreferredSize(new Dimension(FineUIScale.scale(30), JNDIFactoryComboBox.getPreferredSize().height + FineUIScale.scale(2))); + + // 上下文 + JPanel contextPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + contextPane.add(column(LayoutConstants.VERTICAL_GAP, + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("INITIAL_CONTEXT_FACTORY")).weight(0.35), cell(JNDIFactoryComboBox).weight(0.65)), + row(LayoutConstants.HORIZONTAL_GAP,cell(new UILabel("PROVIDER_URL")).weight(0.35), cell(PROVIDER_URL_TF).weight(0.65)), + row(LayoutConstants.HORIZONTAL_GAP,cell(new UILabel("SECURITY_PRINCIPAL")).weight(0.35), cell(SECURITY_PRINCIPAL_TF).weight(0.65)), + row(LayoutConstants.HORIZONTAL_GAP,cell(new UILabel("SECURITY_CREDENTIALS")).weight(0.35), cell(SECURITY_CREDENTIALS_TF).weight(0.65)) + ).getComponent()); + + //其他属性 + JPanel otherAttributePanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Other_Attributes")); - actionPane.add(actionLabel, BorderLayout.EAST); actionLabel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { + //其他属性弹窗 JDialog wDialog = createJDialog(); wDialog.setVisible(true); } }); + otherAttributePanel.add(actionLabel, BorderLayout.EAST); + //注意描述 + JPanel jndiDesPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + jndiDesPanel.add(new JScrollPane(new FRExplainLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_DES"))), BorderLayout.WEST); + //JNDI面板 + JPanel centerPanel = column(LayoutConstants.VERTICAL_GAP, + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_Name"))).weight(0.15), cell(jndiNameTextField).weight(0.85)), + row(cell(getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Context"))).weight(0.15), cell(contextPane).weight(0.85)), + cell(otherAttributePanel), + cell(jndiDesPanel) + ).getComponent(); + this.add(wrapComponentWithTitle(centerPanel,"JNDI")); + } - // South Description - UILabel explainLabe11l = new FRExplainLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_DES")); - innerthis.add(new JScrollPane(explainLabe11l)); + private JPanel getTopAlignLabelPane(String labelText) { + return column(LayoutConstants.VERTICAL_GAP, cell(new UILabel(labelText))) + .with(it -> it.setBorder(new ScaledEmptyBorder(2,0,0,0))).getComponent(); } public void populate(JNDIDatabaseConnection jndiDatabase) { @@ -216,21 +212,23 @@ public class JNDIDefPane extends JPanel { class OtherAttrPane extends BasicPane { public OtherAttrPane() { // JPanel northFlowPane - JPanel northFlowPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - this.add(northFlowPane, BorderLayout.NORTH); - + JPanel northFlowPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + northFlowPane.setBorder(new ScaledEmptyBorder(10,10,10,10)); // ContextPane - double f = TableLayout.FILL; - double[] rowSize = { f, f, f, f, f, f, f, f, f, f, f }; - double[] columnSize = { f, f }; - Component[][] comps = { { new UILabel("OBJECT_FACTORIES:", SwingConstants.RIGHT), OBJECT_FACTORIES_TF }, - { new UILabel("STATE_FACTORIES:", SwingConstants.RIGHT), STATE_FACTORIES_TF }, { new UILabel("URL_PKG_PREFIXES:", SwingConstants.RIGHT), URL_PKG_PREFIXES_TF }, - { new UILabel("DNS_URL:", SwingConstants.RIGHT), DNS_URL_TF }, { new UILabel("AUTHORITATIVE:", SwingConstants.RIGHT), AUTHORITATIVE_TF }, - { new UILabel("BATCHSIZE:", SwingConstants.RIGHT), BATCHSIZE_TF }, { new UILabel("REFERRAL:", SwingConstants.RIGHT), REFERRAL_TF }, - { new UILabel("SECURITY_PROTOCOL:", SwingConstants.RIGHT), SECURITY_PROTOCOL_TF }, - { new UILabel("SECURITY_AUTHENTICATION:", SwingConstants.RIGHT), SECURITY_AUTHENTICATION_TF }, { new UILabel("LANGUAGE:", SwingConstants.RIGHT), LANGUAGE_TF }, - { new UILabel("APPLET:", SwingConstants.RIGHT), APPLET_TF } }; - northFlowPane.add(TableLayoutHelper.createCommonTableLayoutPane(comps, rowSize, columnSize, 2)); + northFlowPane.add(column(LayoutConstants.VERTICAL_GAP, + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("OBJECT_FACTORIES")).weight(0.35), cell(OBJECT_FACTORIES_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("STATE_FACTORIES")).weight(0.35), cell(STATE_FACTORIES_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("URL_PKG_PREFIXES")).weight(0.35), cell(URL_PKG_PREFIXES_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("DNS_URL")).weight(0.35), cell(DNS_URL_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("AUTHORITATIVE")).weight(0.35), cell(AUTHORITATIVE_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("BATCHSIZE")).weight(0.35), cell(BATCHSIZE_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("REFERRAL")).weight(0.35), cell(REFERRAL_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("SECURITY_PROTOCOL")).weight(0.35), cell(SECURITY_PROTOCOL_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("SECURITY_AUTHENTICATION")).weight(0.35), cell(SECURITY_AUTHENTICATION_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("LANGUAGE")).weight(0.35), cell(LANGUAGE_TF)).weight(0.65), + row(LayoutConstants.HORIZONTAL_GAP, cell(new UILabel("APPLET")).weight(0.35), cell(APPLET_TF)).weight(0.65) + ).getComponent()); + this.add(northFlowPane, BorderLayout.NORTH); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java index 48f710dfbf..c404078263 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java @@ -1,5 +1,8 @@ package com.fr.design.data.datapane.connect; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIUtils; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.security.ssh.BaseSsh; import com.fr.data.security.ssh.Ssh; @@ -8,10 +11,10 @@ import com.fr.data.security.ssh.SshType; import com.fr.data.security.ssh.impl.KeyVerifySsh; import com.fr.data.security.ssh.impl.NormalSsh; import com.fr.data.security.ssl.SslUtils; -import com.fr.design.border.UITitledBorder; -import com.fr.design.constants.UIConstants; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.editor.editor.NotNegativeIntegerEditor; +import com.fr.design.gui.core.ReactiveCardPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.UIComboBox; @@ -19,29 +22,22 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; import com.fr.stable.StringUtils; import com.fr.third.guava.collect.HashBiMap; -import javax.swing.ImageIcon; -import javax.swing.JPanel; import javax.swing.JPasswordField; -import javax.swing.SwingConstants; import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.cell; import static com.fr.design.i18n.Toolkit.i18nText; /** @@ -58,114 +54,135 @@ public class SshPane extends BasicPane { typeMap.put(Toolkit.i18nText("Fine-Design_Basic_Ssh_Public_Key"), SshType.KEY); } - private UICheckBox usingSsh = new UICheckBox(i18nText("Fine-Design_Basic_Ssh_Using")); - private NotNegativeIntegerEditor port = new NotNegativeIntegerEditor(20); - private UITextField ip = new UITextField(20); - private UIComboBox type = new UIComboBox(); - private UITextField user = new UITextField(20); - private JPasswordField password = new UIPasswordFieldWithFixedLength(20); - private JPasswordField secret = new UIPasswordFieldWithFixedLength(20); - private KeyFileUITextField keyPath = new KeyFileUITextField(18); - private JPanel contextPane; - private Component[][] passwordComps; - private Component[][] keyComps; - private double p = TableLayout.PREFERRED; - private double f = TableLayout.FILL; - private JPanel jPanel; - private UIButton fileChooserButton = new UIButton(); - private double[] columnSize = new double[]{195, p}; + private final UICheckBox usingSsh = new UICheckBox(i18nText("Fine-Design_Basic_Ssh_Using")); + private final NotNegativeIntegerEditor port = new NotNegativeIntegerEditor(20); + private final UITextField ip = new UITextField(20); + private final UIComboBox type = new UIComboBox(); + private final UITextField user = new UITextField(20); + private final JPasswordField password = new UIPasswordFieldWithFixedLength(20); + private final JPasswordField secret = new UIPasswordFieldWithFixedLength(20); + private final KeyFileUITextField keyPath = new KeyFileUITextField(18); + private ReactiveCardPane coreCardPane; + private ReactiveCardPane verifyCardPane; + private final UIButton fileChooserButton = new UIButton(); + + private static final String USE_SSH = "useSSH"; + private static final String NOT_USE_SSH = "notUseSSH"; + private static final String USE_PASSWORD = "usePassword"; + private static final String USE_KEY = "useKey"; + public SshPane() { - fileChooserButton.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); - this.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Ssh_Settings"))); - this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); + this.setLayout(new BorderLayout()); + + fileChooserButton.setIcon(new LazyIcon("dot")); typeMap.keySet().forEach(key -> type.addItem(key)); type.setSelectedItem(typeMap.inverse().get(SshType.KEY)); - jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - fileChooserButton.setPreferredSize(new Dimension(20, 20)); type.setEditable(false); type.setSelectedItem(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key")); - JPanel filePanel = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPath, fileChooserButton}}, new double[]{p}, new double[]{f, 20}, 0); - Component[] compIp = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host") + ":", SwingConstants.RIGHT), ip}; - Component[] compPort = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Port") + ":", SwingConstants.RIGHT), port}; - Component[] compUserName = {new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName") + ":", SwingConstants.RIGHT), user}; - Component[] compMethod = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Verify_Method") + ":", SwingConstants.RIGHT), type}; - Component[] compPassword = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":", SwingConstants.RIGHT), password}; - Component[] compKey = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key") + ":", SwingConstants.RIGHT), filePanel}; - Component[] comSecret = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Secret") + ":", SwingConstants.RIGHT), secret}; - - passwordComps = new Component[][]{ - compIp, - compPort, - compUserName, - compMethod, - compPassword - }; - keyComps = new Component[][]{ - compIp, - compPort, - compUserName, - compMethod, - compKey, - comSecret - }; - usingSsh.setSelected(true); - contextPane = TableLayoutHelper.createGapTableLayoutPane(keyComps, new double[]{p, p, p, p, p, p}, columnSize, 11, 11); - jPanel.add(usingSsh, BorderLayout.NORTH); - jPanel.add(contextPane, BorderLayout.CENTER); - this.add(jPanel); - - usingSsh.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - changePane(); - } - }); - type.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - changePaneForType(); - } - }); - fileChooserButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(SslUtils.PREFIX, new ChooseFileFilter(true), SslUtils.CERTIFICATES); - int type = fileChooser.showOpenDialog(SshPane.this, StringUtils.EMPTY); - if (type == FILEChooserPane.OK_OPTION) { - final FILE file = fileChooser.getSelectedFILE(); - if (file == null) { - keyPath.setText(StringUtils.EMPTY); - } else { - keyPath.setText(file.getPath()); - } + initVerifyCardPane(); + initCoreCardPane(); + + initListeners(); + + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Settings"))).with(FineUIUtils::wrapBoldLabelWithUnderline), + cell(coreCardPane) + ).getComponent()); + } + + private void initListeners() { + usingSsh.addActionListener(e -> changePane()); + + type.addActionListener(e -> changePaneForType()); + fileChooserButton.addActionListener(e -> { + FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(SslUtils.PREFIX, new ChooseFileFilter(true), SslUtils.CERTIFICATES); + int type = fileChooser.showOpenDialog(SshPane.this, StringUtils.EMPTY); + if (type == FILEChooserPane.OK_OPTION) { + final FILE file = fileChooser.getSelectedFILE(); + if (file == null) { + keyPath.setText(StringUtils.EMPTY); + } else { + keyPath.setText(file.getPath()); } - fileChooser.removeAllFilter(); - fileChooser.removeTopPath(); } + fileChooser.removeAllFilter(); + fileChooser.removeTopPath(); }); } + private void initCoreCardPane() { + coreCardPane = ReactiveCardPane.create() + .addSupplier(NOT_USE_SSH, () -> cell(usingSsh).getComponent()) + .addSupplier(USE_SSH, () -> Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(usingSsh), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host"))).weight(1), + cell(ip).weight(5), + flex(6) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Port"))).weight(1), + cell(port).weight(5), + flex(6) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName"))).weight(1), + cell(user).weight(5), + flex(6) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Verify_Method"))).weight(1), + cell(type).weight(5), + flex(6) + ), + cell(verifyCardPane) + ).getComponent()); + coreCardPane.select(USE_SSH).populate(); + } + + private void initVerifyCardPane() { + verifyCardPane = ReactiveCardPane.create() + .addSupplier(USE_PASSWORD, () -> Layouts.row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password"))).weight(1), + cell(password).weight(5), + flex(6) + ).getComponent()) + .addSupplier(USE_KEY, () -> Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key"))).weight(1), + cell(keyPath).weight(4.5), + flex(0.1), + cell(fileChooserButton).weight(0.4), + flex(6) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Secret"))).weight(1), + cell(secret).weight(5), + flex(6) + ) + ).getComponent()); + + verifyCardPane.select(USE_KEY).populate(); + } + private void changePane() { - contextPane.setVisible(usingSsh.isSelected()); + coreCardPane.select(usingSsh.isSelected() ? USE_SSH: NOT_USE_SSH).populate(); } private void changePaneForType() { - contextPane.removeAll(); switch (typeMap.get(type.getSelectedItem())) { case NORMAL: - TableLayoutHelper.addComponent2ResultPane(passwordComps, new double[]{p, p, p, p, p}, columnSize, contextPane); + verifyCardPane.select(USE_PASSWORD).populate(); break; case KEY: - TableLayoutHelper.addComponent2ResultPane(keyComps, new double[]{p, p, p, p, p, p}, columnSize, contextPane); + verifyCardPane.select(USE_KEY).populate(); break; default: throw new SshException("un support ssh type"); } - jPanel.revalidate(); - jPanel.repaint(); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java index 8789a39a18..10cd4e5e2f 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java @@ -1,37 +1,36 @@ package com.fr.design.data.datapane.connect; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIUtils; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.security.ssl.Ssl; import com.fr.data.security.ssl.SslException; import com.fr.data.security.ssl.SslType; import com.fr.data.security.ssl.SslUtils; import com.fr.data.security.ssl.impl.NormalSsl; -import com.fr.design.border.UITitledBorder; -import com.fr.design.constants.UIConstants; +import com.fr.design.constants.LayoutConstants; import com.fr.design.data.datapane.connect.SshPane.KeyFileUITextField; import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.core.ReactiveCardPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; import com.fr.stable.StringUtils; -import javax.swing.ImageIcon; -import javax.swing.JPanel; import javax.swing.SwingConstants; import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.cell; import static com.fr.design.i18n.Toolkit.i18nText; /** @@ -41,65 +40,66 @@ import static com.fr.design.i18n.Toolkit.i18nText; */ public class SslPane extends BasicPane { UICheckBox usingSsl = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Using")); - private KeyFileUITextField keyPathCa = new KeyFileUITextField(18); - private UIButton fileChooserButtonCa = new UIButton(); - private KeyFileUITextField keyPathClientCert = new KeyFileUITextField(18); - private UIButton fileChooserButtonClientCert = new UIButton(); - private KeyFileUITextField keyPathClientKey = new KeyFileUITextField(18); - private UIButton fileChooserButtonClientKey = new UIButton(); - private UICheckBox verifyCa = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Verify_Ca")); -// private UITextField cipher = new UITextField(20); - private JPanel jPanel; - private Component[][] usingComps; - private double p = TableLayout.PREFERRED; - private double f = TableLayout.FILL; - private JPanel contextPane; - private double[] columnSize = new double[]{195, p}; + private final KeyFileUITextField keyPathCa = new KeyFileUITextField(18); + private final UIButton fileChooserButtonCa = new UIButton(); + private final KeyFileUITextField keyPathClientCert = new KeyFileUITextField(18); + private final UIButton fileChooserButtonClientCert = new UIButton(); + private final KeyFileUITextField keyPathClientKey = new KeyFileUITextField(18); + private final UIButton fileChooserButtonClientKey = new UIButton(); + private final UICheckBox verifyCa = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Verify_Ca")); + private final ReactiveCardPane cardPane; public SslPane() { - fileChooserButtonCa.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); - fileChooserButtonClientCert.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); - fileChooserButtonClientKey.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); - this.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Ssl_Settings"))); - this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); - jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - Dimension dimension = new Dimension(20, 20); - fileChooserButtonCa.setPreferredSize(dimension); - fileChooserButtonClientCert.setPreferredSize(dimension); - fileChooserButtonClientKey.setPreferredSize(dimension); - JPanel filePanelCa = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathCa, fileChooserButtonCa}}, new double[]{p}, new double[]{f, 20}, 0); - Component[] compCa = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Ca") + ":", SwingConstants.RIGHT), filePanelCa}; - Component[] compVerifyCa = {null, verifyCa}; - JPanel filePanelClientKey = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathClientKey, fileChooserButtonClientKey}}, new double[]{p}, new double[]{f, 20}, 0); - Component[] compClientKey = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Key") + ":", SwingConstants.RIGHT), filePanelClientKey}; - JPanel filePanelClientCert = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathClientCert, fileChooserButtonClientCert}}, new double[]{p}, new double[]{f, 20}, 0); - Component[] compClientCert = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Cert") + ":", SwingConstants.RIGHT), filePanelClientCert}; -// Component[] comCipher = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Cipher") + ":", SwingConstants.RIGHT), cipher}; - usingComps = new Component[][]{ - compCa, - compVerifyCa, - compClientKey, - compClientCert -// comCipher - }; + initDotButtons(); + this.setLayout(new BorderLayout()); usingSsl.setSelected(true); - contextPane = TableLayoutHelper.createGapTableLayoutPane(usingComps, new double[]{p, p, p, p}, columnSize, 11, 11); - jPanel.add(usingSsl, BorderLayout.NORTH); - jPanel.add(contextPane, BorderLayout.CENTER); - this.add(jPanel); - usingSsl.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - changePane(); - } - }); + cardPane = ReactiveCardPane.create() + .addSupplier("notUseSSL", () -> cell(usingSsl).getComponent()) + .addSupplier("useSSL", () -> Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(usingSsl), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Ca"), SwingConstants.LEFT)).weight(1), + cell(keyPathCa).weight(1.3), + flex(0.05), + cell(fileChooserButtonCa).weight(0.15), + flex(2) + ), + cell(verifyCa), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Key"), SwingConstants.LEFT)).weight(1), + cell(keyPathClientKey).weight(1.3), + flex(0.05), + cell(fileChooserButtonClientKey).weight(0.15), + flex(2) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Cert"), SwingConstants.LEFT)).weight(1), + cell(keyPathClientCert).weight(1.3), + flex(0.05), + cell(fileChooserButtonClientCert).weight(0.15), + flex(2) + ) + ).getComponent() + ); + cardPane.select("useSSL").populate(); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Settings"))).with(FineUIUtils::wrapBoldLabelWithUnderline), + cell(cardPane) + ).getComponent()); + usingSsl.addActionListener(e -> changePane()); + } + + private void initDotButtons() { + fileChooserButtonCa.setIcon(new LazyIcon("dot")); + fileChooserButtonClientCert.setIcon(new LazyIcon("dot")); + fileChooserButtonClientKey.setIcon(new LazyIcon("dot")); fileChooserButtonCa.addActionListener(new TextFieldActionListener(keyPathCa)); fileChooserButtonClientCert.addActionListener(new TextFieldActionListener(keyPathClientCert)); fileChooserButtonClientKey.addActionListener(new TextFieldActionListener(keyPathClientKey)); } private void changePane() { - contextPane.setVisible(usingSsl.isSelected()); + cardPane.select(usingSsl.isSelected() ? "useSSL" : "notUseSSL").populate(); } @@ -120,7 +120,6 @@ public class SslPane extends BasicPane { keyPathClientCert.setText(normalSsl.getClientCertificate()); keyPathClientKey.setText(normalSsl.getClientPrivateKey()); verifyCa.setSelected(normalSsl.isVerifyCa()); -// cipher.setText(normalSsl.getCipher()); } else { throw new SslException("un support ssl type"); } @@ -130,7 +129,6 @@ public class SslPane extends BasicPane { public void update(JDBCDatabaseConnection jdbcDatabase) { NormalSsl normalSsl = new NormalSsl(); -// normalSsl.setCipher(cipher.getText().trim()); normalSsl.setVerifyCa(verifyCa.isSelected()); normalSsl.setCaCertificate(keyPathCa.getText().trim()); normalSsl.setClientCertificate(keyPathClientCert.getText().trim()); @@ -140,7 +138,7 @@ public class SslPane extends BasicPane { } private class TextFieldActionListener implements ActionListener { - private UITextField textField; + private final UITextField textField; public TextFieldActionListener(UITextField textField) { this.textField = textField; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/FineSearchPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/FineSearchPane.java new file mode 100644 index 0000000000..ccfd7be6be --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/FineSearchPane.java @@ -0,0 +1,165 @@ +package com.fr.design.data.datapane.management.search.pane; + +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIUtils; +import com.fr.design.event.HoverAware; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itextfield.UITextField; + +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.event.DocumentListener; +import java.awt.BorderLayout; +import java.awt.Insets; +import java.awt.event.ActionListener; +import java.awt.event.KeyListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import static com.fine.theme.utils.FineUIStyle.STYLE_TEXT; +import static com.fine.theme.utils.FineUIStyle.TRANSPARENT_TEXT_FIELD; +import static com.fine.theme.utils.FineUIStyle.setStyle; + +/** + * 搜索面板 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/13 + */ +public class FineSearchPane extends JPanel implements HoverAware { + + private final Insets defaultLabelInsets = new Insets(3, 6, 3, 4); + private final Insets defaultButtonInsets = new Insets(4, 4, 4, 4); + private UITextField searchTextField; + private UIButton clearButton; + + + private static final String UI_CLASS_ID = "InputUI"; + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + + private boolean hover; + + public FineSearchPane() { + this.setLayout(new BorderLayout()); + + initComponents(); + } + + private void initComponents() { + // 左侧搜索图标 + UILabel searchLabel = new UILabel(new LazyIcon("search")); + Insets labelInsets = FineUIUtils.getAndScaleUIInsets("SearchPanel.labelBorderInsets", defaultLabelInsets); + searchLabel.setBorder(BorderFactory.createEmptyBorder(labelInsets.top, labelInsets.left, labelInsets.bottom, labelInsets.right)); + + // 中间输入框 + searchTextField = new UITextField(); + setStyle(searchTextField, TRANSPARENT_TEXT_FIELD); + + // 右侧返回图标 + clearButton = new UIButton(new LazyIcon("clear")); + setStyle(clearButton, STYLE_TEXT); + Insets buttonInsets = FineUIUtils.getAndScaleUIInsets("SearchPanel.buttonBorderInsets", defaultButtonInsets); + clearButton.setBorder(BorderFactory.createEmptyBorder(buttonInsets.top, buttonInsets.left, buttonInsets.bottom, buttonInsets.right)); + + this.add(searchLabel, BorderLayout.WEST); + this.add(searchTextField, BorderLayout.CENTER); + this.add(clearButton, BorderLayout.EAST); + + addHoverStatusListener(searchLabel); + addHoverStatusListener(searchTextField); + addHoverStatusListener(clearButton); + } + + private void addHoverStatusListener(JComponent component) { + component.addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent e) { + hover = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + hover = false; + repaint(); + } + }); + } + + @Override + public boolean isHovered() { + return hover; + } + + /** + * 添加KeyListener + * + * @param listener the key listener. + */ + public void addKeyListener(KeyListener listener) { + searchTextField.addKeyListener(listener); + } + + public void setPlaceholder(String placeHolder) { + searchTextField.setPlaceholder(placeHolder); + } + + public void setClearToolTipText(String text) { + clearButton.setToolTipText(text); + } + + /** + * 添加DocumentListener + * + * @param listener + */ + public void addDocumentListener(DocumentListener listener) { + searchTextField.getDocument().addDocumentListener(listener); + } + + /** + * 按钮添加监听器 + * + * @param listener + */ + public void addClearActionListener(ActionListener listener) { + clearButton.addActionListener(listener); + } + + /** + * 按钮添加鼠标监听 + * + * @param mouseAdapter + */ + public void addClearMouseListener(MouseAdapter mouseAdapter) { + clearButton.addMouseListener(mouseAdapter); + } + + public String getText() { + return searchTextField.getText(); + } + + public void setText(String text) { + searchTextField.setText(text); + } + + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + searchTextField.setEnabled(enabled); + clearButton.setEnabled(enabled); + } + + @Override + public void requestFocus() { + super.requestFocus(); + searchTextField.requestFocus(); + } +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TableDataSearchRemindPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TableDataSearchRemindPane.java index dad2d4d4c6..2b4778dae6 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TableDataSearchRemindPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TableDataSearchRemindPane.java @@ -1,5 +1,7 @@ package com.fr.design.data.datapane.management.search.pane; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.svg.IconUtils; import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.TableDataTree; @@ -7,23 +9,24 @@ import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.search.TreeSearchStatus; import com.fr.design.search.event.TreeSearchStatusChangeEvent; import com.fr.design.search.event.TreeSearchStatusChangeListener; -import javax.swing.BorderFactory; +import javax.swing.JLayer; import javax.swing.JPanel; import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.CardLayout; -import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; + /** * @author Yvan */ @@ -81,7 +84,7 @@ public class TableDataSearchRemindPane extends JPanel implements TreeSearchStatu private class TreePane extends JPanel implements TreeSearchStatusChange { - private UIScrollPane scrollPane; + private JLayer scrollPane; private JPanel notFoundPane; @@ -97,21 +100,18 @@ public class TableDataSearchRemindPane extends JPanel implements TreeSearchStatu private void init(TableDataTree tableDataTree) { - scrollPane = new UIScrollPane(tableDataTree); - scrollPane.setBorder(null); + scrollPane = FineUIUtils.createCollapsibleScrollBarLayer(tableDataTree); - notFoundPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5); UILabel emptyPicLabel = new UILabel(); emptyPicLabel.setIcon(IconUtils.readIcon("com/fr/base/images/share/no_match_icon.png")); emptyPicLabel.setHorizontalAlignment(SwingConstants.CENTER); - emptyPicLabel.setPreferredSize(new Dimension(240, 100)); - UILabel textLabel = new UILabel(Toolkit.i18nText("Fine-Design_Tree_Search_Not_Match"), SwingConstants.CENTER); - textLabel.setForeground(Color.gray); + UILabel textLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tree_Search_Not_Match"), SwingConstants.CENTER); + FineUIStyle.setStyle(textLabel, FineUIStyle.LABEL_TIP); textLabel.setHorizontalAlignment(SwingConstants.CENTER); - textLabel.setPreferredSize(new Dimension(240, 20)); - notFoundPane.add(emptyPicLabel); - notFoundPane.add(textLabel); - notFoundPane.setBorder(BorderFactory.createEmptyBorder(80, 0, 0, 0)); + + notFoundPane = column(10, + flex(1), cell(emptyPicLabel), cell(textLabel), flex(1.5) + ).getComponent(); cardLayout = new CardLayout(); this.setLayout(cardLayout); @@ -168,7 +168,7 @@ public class TableDataSearchRemindPane extends JPanel implements TreeSearchStatu this.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 0)); // 初始情况下为Not_Begin textLabel = new UILabel(); - textLabel.setForeground(Color.gray); + FineUIStyle.setStyle(textLabel, FineUIStyle.LABEL_TIP); stopLabel = new UILabel(); stopLabel.setForeground(UIConstants.NORMAL_BLUE); stopSearch = new MouseAdapter() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java index f5266c9b6d..6531a558ad 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java @@ -1,35 +1,27 @@ package com.fr.design.data.datapane.management.search.pane; -import com.fr.base.svg.IconUtils; +import com.fine.theme.utils.FineUIScale; import com.fr.design.DesignModelAdapter; -import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager; -import com.fr.design.search.event.TreeSearchStatusChangeEvent; -import com.fr.design.search.event.TreeSearchStatusChangeListener; -import com.fr.design.search.TreeSearchStatus; -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.search.TreeSearchStatus; +import com.fr.design.search.event.TreeSearchStatusChangeEvent; +import com.fr.design.search.event.TreeSearchStatusChangeListener; import com.fr.stable.StringUtils; import javax.swing.BorderFactory; import javax.swing.JPanel; +import javax.swing.UIManager; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import java.awt.BorderLayout; import java.awt.CardLayout; -import java.awt.Color; -import java.awt.Dimension; import java.awt.Insets; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; /** * @author Yvan @@ -53,13 +45,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha /** * 搜索面板 */ - private JPanel searchPane; - - /** - * 搜索输入框 - */ - private UITextField searchTextField; - + private FineSearchPane searchPane; /** * 内容面板 */ @@ -74,7 +60,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { - TableDataTreeSearchManager.getInstance().startSearch(searchTextField.getText()); + TableDataTreeSearchManager.getInstance().startSearch(searchPane.getText()); } } }; @@ -86,54 +72,25 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha initSearchPane(); initContentPane(); add(contentPane, BorderLayout.CENTER); - setPreferredSize(new Dimension(240, 30)); TableDataTreeSearchManager.getInstance().registerTreeSearchStatusChangeListener(this); } private void initContentPane() { cardLayout = new CardLayout(); contentPane = new JPanel(cardLayout); + Insets insets = UIManager.getInsets("TreeSearchToolbarPane.borderInsets"); + Insets scaledInsets = FineUIScale.scale(insets); + contentPane.setBorder(BorderFactory.createEmptyBorder(scaledInsets.top, scaledInsets.left, scaledInsets.bottom, scaledInsets.right)); contentPane.add(searchPane, SEARCH_PANE); contentPane.add(toolbarPane, TOOLBAR_PANE); cardLayout.show(contentPane, TOOLBAR_PANE); } private void initSearchPane() { - searchPane = new JPanel(FRGUIPaneFactory.createBorderLayout()); - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR)); - searchPane.setBackground(Color.WHITE); - // 左侧搜索图标 - UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/search")); - searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0)); - searchLabel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - // do nothing - } - }); + searchPane = new FineSearchPane(); // 中间输入框 - searchTextField = new UITextField(){ - @Override - public Insets getInsets() { - return new Insets(2, 4, 0, 4); - } - }; - searchTextField.setBorderPainted(false); - searchTextField.setPlaceholder(Toolkit.i18nText("Fine-Design_Tree_Search_Press_Enter_For_Search")); - searchTextField.addFocusListener(new FocusListener() { - @Override - public void focusGained(FocusEvent e) { - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.NORMAL_BLUE)); - searchPane.repaint(); - } - - @Override - public void focusLost(FocusEvent e) { - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR)); - searchPane.repaint(); - } - }); - this.searchTextField.getDocument().addDocumentListener(new DocumentListener() { + searchPane.setPlaceholder(Toolkit.i18nText("Fine-Design_Tree_Search_Press_Enter_For_Search")); + searchPane.addDocumentListener(new DocumentListener() { @Override public void insertUpdate(DocumentEvent e) { } @@ -147,25 +104,15 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha public void changedUpdate(DocumentEvent e) { } }); - this.searchTextField.addKeyListener(enterPressed); - // 右侧返回图标 - UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear")); - returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return")); - returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11)); - returnLabel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - TableDataTreeSearchManager.getInstance().outOfSearchMode(); - } - }); - - searchPane.add(searchLabel, BorderLayout.WEST); - searchPane.add(searchTextField, BorderLayout.CENTER); - searchPane.add(returnLabel, BorderLayout.EAST); + searchPane.addKeyListener(enterPressed); + searchPane.setClearToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return")); + searchPane.addClearActionListener(e -> TableDataTreeSearchManager.getInstance().outOfSearchMode()); } + + private void dealWithTextChange() { - if (StringUtils.isEmpty(searchTextField.getText()) && TableDataTreeSearchManager.getInstance().isInSearchMode()) { + if (StringUtils.isEmpty(searchPane.getText()) && TableDataTreeSearchManager.getInstance().isInSearchMode()) { // 如果是搜索模式下，看作是用户删除输入框文字，仅复原TableDataTreePane TableDataTreeSearchManager.getInstance().restoreTreePane(); TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView(); @@ -186,7 +133,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha } public void setPlaceHolder(String placeHolder) { - this.searchTextField.setPlaceholder(placeHolder); + searchPane.setPlaceholder(placeHolder); } /** @@ -198,10 +145,11 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha public void updateTreeSearchChange(TreeSearchStatusChangeEvent event) { TreeSearchStatus treeSearchStatus = event.getTreeSearchStatus(); if (treeSearchStatus == TreeSearchStatus.NOT_IN_SEARCH_MODE) { - this.searchTextField.setText(StringUtils.EMPTY); + searchPane.setText(StringUtils.EMPTY); switchPane(TOOLBAR_PANE); } else { switchPane(SEARCH_PANE); + searchPane.requestFocus(); } } } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java index a452a4d371..6071fa3daa 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/CopyableJTable.java @@ -7,7 +7,6 @@ import com.fr.log.FineLoggerFactory; import com.fr.stable.os.OperatingSystem; import javax.swing.*; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; @@ -72,7 +71,7 @@ public class CopyableJTable extends SortableJTable { public CopyableJTable(TableSorter tableModel) { super(tableModel); initListener(); - this.getTableHeader().setDefaultRenderer(new CopyableTableHeaderCellRenderer(this.getTableHeader().getDefaultRenderer())); + setShowGrid(true); } private void initListener() { @@ -211,8 +210,6 @@ public class CopyableJTable extends SortableJTable { Component comp = super.prepareRenderer(renderer, row, column); if (isChoose(row, column)) { comp.setBackground(selectBackGround); - } else { - comp.setBackground(this.getBackground()); } return comp; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java index 4fa695fd21..48df699015 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java @@ -5,7 +5,8 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; import com.fr.design.gui.ibutton.UIButton; @@ -16,7 +17,7 @@ public class PreviewLabel extends UIButton { Previewable previewable; public PreviewLabel(Previewable previewable) { - super(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png")); + super(new LazyIcon("preview")); this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); this.setCursor(new Cursor(Cursor.HAND_CURSOR)); this.previewable = previewable; @@ -27,7 +28,7 @@ public class PreviewLabel extends UIButton { PreviewLabel.this.previewable.preview(); } }); - this.setPreferredSize(new Dimension(24, 20)); + this.setPreferredSize(FineUIScale.scale(new Dimension(24, 24))); } public static interface Previewable { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java index 345475bf76..ded29560fe 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java @@ -3,8 +3,12 @@ */ package com.fr.design.data.datapane.preview; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineTableHeaderUI; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.TableData; -import com.fr.base.svg.IconUtils; import com.fr.data.TableDataSource; import com.fr.data.desensitize.base.DesensitizationTableData; import com.fr.data.impl.DBTableData; @@ -23,6 +27,8 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.icontainer.UITableScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.iprogressbar.AutoProgressBar; import com.fr.design.gui.itable.SortableJTable; @@ -47,6 +53,7 @@ import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JScrollBar; import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.SwingUtilities; @@ -69,6 +76,9 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.CancellationException; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * august： PreviewTablePane一共提供5个共有的静态方法，用来预览。 */ @@ -85,12 +95,15 @@ public class PreviewTablePane extends BasicPane { private BasicDialog dialog; private SwingWorker worker; - private UILabel refreshLabel; + private UIButton refreshLabel; private static PreviewTablePane THIS; private EmbeddedTableData previewTableData; private PreviewTableDesensitizationPane desensitizationPane; + private static final int PREVIEW_TABLE_MIN_COLUMN_WIDTH = FineUIScale.scale(75); + private static final int PREVIEW_TABLE_WIDTH = FineUIScale.scale(600); + /** * 用于refreshLabel的鼠标监听 */ @@ -101,31 +114,22 @@ public class PreviewTablePane extends BasicPane { @Override public void mouseEntered(MouseEvent e) { // 当鼠标进入时候调用. mouseEntered = true; - if (!buttonPressed) { - refreshLabel.setBackground(java.awt.Color.WHITE); - refreshLabel.setOpaque(true); - refreshLabel.setBorder(BorderFactory.createLineBorder(java.awt.Color.GRAY)); - } } @Override public void mouseExited(MouseEvent e) { mouseEntered = false; - refreshLabel.setOpaque(false); - refreshLabel.setBorder(BorderFactory.createEmptyBorder()); } @Override public void mousePressed(MouseEvent e) { buttonPressed = true; - refreshLabel.setBackground(java.awt.Color.lightGray); } @Override public void mouseReleased(MouseEvent e) { buttonPressed = false; if (mouseEntered) { - refreshLabel.setBackground(java.awt.Color.WHITE); try { populate(tableData); if (dataModel != null) { @@ -145,9 +149,9 @@ public class PreviewTablePane extends BasicPane { } private PreviewTablePane() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setLayout(new BorderLayout(0, FineUIScale.scale(10))); // northPane - this.add(initNorthPane(), BorderLayout.NORTH); + this.add(FineUIUtils.wrapComponentWithTitle(initNorthPane(), Toolkit.i18nText("Fine-Design_Basic_Data")), BorderLayout.NORTH); // centerPane this.add(initCenterPane(), BorderLayout.CENTER); // dialog @@ -176,20 +180,14 @@ public class PreviewTablePane extends BasicPane { * @return */ private JComponent initPreviewNumberPane() { - JPanel previewNumberPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + JPanel previewNumberPanel = new JPanel(new BorderLayout()); // 当前行数 - JPanel currentPreviewPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - currentPreviewPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Current_Preview_Rows") + ":")); currentRowsField = new UINumberField(); - currentPreviewPanel.add(currentRowsField); currentRowsField.setEditable(false); currentRowsField.setColumns(4); currentRowsField.setInteger(true); // 最大行数 - JPanel maxPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - maxPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Maximum_Number_of_Preview_Rows") + ":")); maxPreviewNumberField = new UINumberField(); - maxPanel.add(maxPreviewNumberField); maxPreviewNumberField.setColumns(4); maxPreviewNumberField.setInteger(true); maxPreviewNumberField.setValue(DesignerEnvManager.getEnvManager().getMaxNumberOrPreviewRow()); @@ -200,15 +198,19 @@ public class PreviewTablePane extends BasicPane { // 刷新按钮 initRefreshLabel(); - previewNumberPanel.add(currentPreviewPanel); - previewNumberPanel.add(maxPanel); - previewNumberPanel.add(refreshLabel); + previewNumberPanel.add(row(20, + row(4, cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Current_Preview_Rows") + ":")), cell(currentRowsField)), + row(4, cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Maximum_Number_of_Preview_Rows") + ":")), cell(maxPreviewNumberField)), + cell(refreshLabel) + ).getComponent()); + return previewNumberPanel; } private void initRefreshLabel() { - Icon refreshImage = IconUtils.readIcon("/com/fr/design/images/control/refresh"); - refreshLabel = new UILabel(refreshImage); + Icon refreshImage = new LazyIcon("refresh"); + refreshLabel = new UIButton(refreshImage); + FineUIStyle.setStyle(refreshLabel, FineUIStyle.ORIGINAL_BUTTON); refreshLabel.addMouseListener(refreshLabelMouseAdapter); } @@ -308,8 +310,9 @@ public class PreviewTablePane extends BasicPane { private JComponent initCenterPane() { preveiwTable = new CopyableJTable(new TableSorter()); preveiwTable.setRowSelectionAllowed(false); - preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); - return new JScrollPane(preveiwTable); + preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); + UITableScrollPane scrollPane = new UITableScrollPane(preveiwTable); + return scrollPane; } private void initDialog() { @@ -403,7 +406,11 @@ public class PreviewTablePane extends BasicPane { public static void resetPreviewTable() { getInstance().preveiwTable = new SortableJTable(new TableSorter()); getInstance().preveiwTable.setRowSelectionAllowed(false); - getInstance().preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); + if (getInstance().preveiwTable.getColumnCount() * PREVIEW_TABLE_MIN_COLUMN_WIDTH > PREVIEW_TABLE_WIDTH) { + getInstance().preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); + } else { + getInstance().preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); + } PreviewTablePane.progressBar.close(); getInstance().repaint(); } @@ -413,6 +420,10 @@ public class PreviewTablePane extends BasicPane { tableSorter.setTableModel(tableModel); + if (tableModel.getColumnCount() * PREVIEW_TABLE_MIN_COLUMN_WIDTH > PREVIEW_TABLE_WIDTH) { + preveiwTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); + } + preveiwTable.getParent().validate(); preveiwTable.repaint(); } @@ -436,7 +447,6 @@ public class PreviewTablePane extends BasicPane { */ public static EmbeddedTableData previewTableData(TableData tableData, final int keyIndex, final int valueIndex) { PreviewTablePane previewTablePane = new PreviewTablePane(); - previewTablePane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Data"))); try { previewTablePane.populate(tableData); previewTablePane.resetPreviewTableColumnColor(); @@ -512,7 +522,7 @@ public class PreviewTablePane extends BasicPane { * @return */ private DefaultTableCellRenderer getDefaultTableCellRenderer() { - return new DefaultTableCellRenderer() { + return new FineTableHeaderUI.TableRenderer() { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { JComponent comp = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); @@ -649,7 +659,6 @@ public class PreviewTablePane extends BasicPane { public static void previewDataModel(final DataModel dataModel, final int keyIndex, final int valueIndex) { final PreviewTablePane previewTablePane = new PreviewTablePane(); previewTablePane.dataModel = dataModel; - previewTablePane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Data"))); try { previewTablePane.setRowsLimitTableModel(); @@ -678,8 +687,6 @@ public class PreviewTablePane extends BasicPane { // 单个结果集的展示面板 PreviewTablePane previewTablePane = new PreviewTablePane(); previewTablePane.dataModel = nameDataModel; - // 数据 - previewTablePane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Data"))); try { // 带行数限制的数据集结果预览对象 previewTablePane.setRowsLimitTableModel(); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/PreviewTableDesensitizationPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/PreviewTableDesensitizationPane.java index 01c92e333f..a351028194 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/PreviewTableDesensitizationPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/PreviewTableDesensitizationPane.java @@ -1,22 +1,25 @@ package com.fr.design.data.datapane.preview.desensitization.view; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.preview.PreviewTablePane; -import com.fr.design.gui.ibutton.UIToggleButton; +import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.i18n.Toolkit; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ToolBarDef; -import javax.swing.Icon; import javax.swing.JPanel; +import java.awt.BorderLayout; import java.awt.Component; -import java.awt.FlowLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 数据集预览-脱敏配置面板，主要展示当前脱敏开启状态、当前脱敏设定数量等 * @@ -44,7 +47,7 @@ public class PreviewTableDesensitizationPane extends JPanel { /** * 脱敏效果预览按钮 */ - private UIToggleButton previewToggle; + private UIButton previewToggle; public PreviewTableDesensitizationPane(PreviewTablePane previewTablePane) { @@ -56,10 +59,8 @@ public class PreviewTableDesensitizationPane extends JPanel { * 初始化面板 */ private void initComponents() { - this.setLayout(new FlowLayout(FlowLayout.LEFT)); - this.add(initDesensitizationLabel()); - this.add(initToolBar()); - this.add(initPreviewButton()); + this.setLayout(new BorderLayout()); + this.add(row(cell(initDesensitizationLabel()), cell(initToolBar()), cell(initPreviewButton())).getComponent()); } /** @@ -99,10 +100,12 @@ public class PreviewTableDesensitizationPane extends JPanel { * * @return */ - private UIToggleButton initPreviewButton() { - previewToggle = new UIToggleButton(new Icon[]{IconUtils.readIcon("/com/fr/design/images/m_file/preview"), IconUtils.readIcon("/com/fr/design/images/m_file/preview")}, true); + private UIButton initPreviewButton() { + previewToggle = new UIButton(); + previewToggle.setIcon(new LazyIcon("preview")); previewToggle.setToolTipText(Toolkit.i18nText("Fine-Design_Report_Desensitization_Preview")); previewToggle.setSelected(false); + FineUIStyle.setStyle(previewToggle, FineUIStyle.ORIGINAL_BUTTON); previewToggle.addActionListener(e -> { // 切换TableModel的脱敏状态 previewTablePane.togglePreviewTableModelDesensitizeStatus(); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/ChooseMark.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/ChooseMark.java index 099e9a960a..8990d27b73 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/ChooseMark.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/ChooseMark.java @@ -1,13 +1,23 @@ package com.fr.design.data.datapane.preview.desensitization.view.common; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.gui.ibutton.UIRadioButton; import javax.swing.AbstractCellEditor; +import javax.swing.BorderFactory; +import javax.swing.JPanel; import javax.swing.JTable; +import javax.swing.UIManager; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; +import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 标记选中的CellEditor * @@ -17,16 +27,21 @@ import java.awt.Component; */ public class ChooseMark extends AbstractCellEditor implements TableCellEditor, TableCellRenderer { - private final UIRadioButton selectedButton; + private UIRadioButton selectedButton; + private final JPanel pane = new JPanel(new BorderLayout()); public ChooseMark() { this.selectedButton = new UIRadioButton(); + this.selectedButton.setOpaque(false); + pane.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + pane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor"))); } @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { selectedButton.setSelected(isSelected); - return selectedButton; + pane.add(row(flex(), cell(selectedButton), flex()).getComponent()); + return pane; } @Override @@ -36,7 +51,10 @@ public class ChooseMark extends AbstractCellEditor implements TableCellEditor, T @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + pane.removeAll(); + selectedButton = new UIRadioButton(); selectedButton.setSelected(isSelected); - return selectedButton; + pane.add(row(flex(), cell(selectedButton), flex()).getComponent()); + return pane; } } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/DesensitizationOpenPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/DesensitizationOpenPane.java index e04c3fed0e..0cf850d4dc 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/DesensitizationOpenPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/DesensitizationOpenPane.java @@ -1,5 +1,6 @@ package com.fr.design.data.datapane.preview.desensitization.view.common; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.svg.IconUtils; import com.fr.design.border.UITitledBorder; import com.fr.design.constants.UIConstants; @@ -14,11 +15,15 @@ import com.fr.general.locale.LocaleMark; import com.fr.log.FineLoggerFactory; import javax.swing.JPanel; +import java.awt.BorderLayout; import java.awt.Desktop; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.net.URL; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + /** * 启用数据脱敏的面板 * @@ -45,10 +50,7 @@ public class DesensitizationOpenPane extends JPanel { public DesensitizationOpenPane() { - VerticalFlowLayout layout = new VerticalFlowLayout(VerticalFlowLayout.TOP); - layout.setAlignLeft(true); - this.setLayout(layout); - this.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Report_Desensitization_Config"))); + this.setLayout(new BorderLayout()); JPanel panel = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); // 启用数据脱敏的勾选框 @@ -73,10 +75,7 @@ public class DesensitizationOpenPane extends JPanel { // 提示Label tipsLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Desensitization_Opened_Tooltips")); - tipsLabel.setForeground(UIConstants.CHECK_BOX_TIP_FONT_COLOR); - - this.add(panel); - this.add(tipsLabel); + this.add(FineUIUtils.wrapComponentWithTitle(column(10, cell(panel), cell(tipsLabel)).getComponent(), Toolkit.i18nText("Fine-Design_Report_Desensitization_Config"))); } /** diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java index 54b139a3dd..dc0eaf2011 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java @@ -1,5 +1,8 @@ package com.fr.design.data.datapane.preview.desensitization.view.rule; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.base.svg.IconUtils; import com.fr.data.desensitize.rule.DesensitizationRuleManager; import com.fr.data.desensitize.rule.base.DesensitizationRule; @@ -19,12 +22,10 @@ import com.fr.stable.collections.CollectionUtils; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; -import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTable; -import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.UIManager; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.CardLayout; @@ -134,18 +135,7 @@ public class DesensitizationRuleChoosePane extends JPanel { this.setDefaultRenderer(ChooseMark.class, new ChooseMark()); this.setDefaultEditor(DesensitizationRuleStatusPane.class, new DesensitizationRuleStatusPane()); this.setDefaultRenderer(DesensitizationRuleStatusPane.class, new DesensitizationRuleStatusPane()); - this.createTable().getColumnModel().getColumn(0).setMaxWidth(20); - this.createTable().getColumnModel().getColumn(3).setMaxWidth(60); - this.createTable().getColumnModel().getColumn(3).setHeaderRenderer(new DefaultTableCellRenderer() { - @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - JLabel headerLabel = new JLabel(value != null ? value.toString() : ""); - headerLabel.setToolTipText((String) value); - headerLabel.setHorizontalAlignment(SwingConstants.CENTER); - headerLabel.setBorder(BorderFactory.createMatteBorder(0, 0, 3, 0, new Color(216, 216, 216, 175))); - return headerLabel; - } - }); + this.createTable().getColumnModel().getColumn(0).setMaxWidth(FineUIScale.scale(28)); } @Override @@ -213,6 +203,9 @@ public class DesensitizationRuleChoosePane extends JPanel { // 规则状态 this.ruleStatusLabel = new UILabel(); this.ruleStatusLabel.setForeground(Color.RED); + this.ruleStatusLabel.setOpaque(true); + this.ruleStatusLabel.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + this.ruleStatusLabel.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor"))); } /** @@ -257,7 +250,7 @@ public class DesensitizationRuleChoosePane extends JPanel { public AddRuleAction() { this.setName(Toolkit.i18nText("Fine-Design_Report_Desensitization_Add")); - this.setSmallIcon("/com/fr/design/standard/add/add_black", false); + this.setSmallIcon(new LazyIcon("add")); } @Override @@ -290,7 +283,7 @@ public class DesensitizationRuleChoosePane extends JPanel { public EditRuleAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Edit")); - this.setSmallIcon(IconUtils.readIcon("/com/fr/design/standard/edit/edit")); + this.setSmallIcon(new LazyIcon("edit")); } @Override @@ -336,7 +329,7 @@ public class DesensitizationRuleChoosePane extends JPanel { public DeleteRuleAction(Component parent) { super(parent); this.setName(Toolkit.i18nText("Fine-Design_Basic_Base_Remove")); - this.setSmallIcon("/com/fr/design/images/control/remove"); + this.setSmallIcon(new LazyIcon("remove")); } @Override @@ -363,7 +356,7 @@ public class DesensitizationRuleChoosePane extends JPanel { public DebugRuleAction(Component parent) { this.parent = parent; this.setName(Toolkit.i18nText("Fine-Design_Report_Desensitization_Rule_Debug")); - this.setSmallIcon("/com/fr/design/standard/debug/debug"); + this.setSmallIcon(new LazyIcon("debug")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleDebugPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleDebugPane.java index eba6d10899..fc7fdb8852 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleDebugPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleDebugPane.java @@ -1,5 +1,7 @@ package com.fr.design.data.datapane.preview.desensitization.view.rule; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.desensitize.calculate.DesensitizationCalculator; import com.fr.data.desensitize.rule.base.DesensitizationRule; import com.fr.design.dialog.BasicPane; @@ -22,6 +24,11 @@ import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 脱敏规则调试页 * @@ -48,9 +55,8 @@ public class DesensitizationRuleDebugPane extends BasicPane { } private JPanel initNorthPane() { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Desensitization_Rule_Description")); + JPanel northPane = new JPanel(new BorderLayout()); JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - panel.setBorder(BorderFactory.createEmptyBorder(20, 10, 0, 0)); UILabel desensitizationRule = new UILabel(Toolkit.i18nText("Fine-Design_Report_Desensitization_Rule_Algorithm")); UILabel characterReplace = new UILabel(rule.getRuleType().getRuleTypeName()); UILabel description = new UILabel(DesensitizationRule.getDescription(rule)); @@ -65,14 +71,14 @@ public class DesensitizationRuleDebugPane extends BasicPane { new double[]{TableLayout.PREFERRED, TableLayout.PREFERRED}, 20), BorderLayout.CENTER); - northPane.add(panel); + northPane.add(FineUIUtils.wrapComponentWithTitle(panel, Toolkit.i18nText("Fine-Design_Report_Desensitization_Rule_Description"))); + northPane.setBorder(new ScaledEmptyBorder(0, 0, 10, 0)); return northPane; } private JPanel initCenterPane() { - JPanel centerPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Desensitization_Rule_Debug")); + JPanel centerPane = new JPanel(new BorderLayout()); JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - panel.setBorder(BorderFactory.createEmptyBorder(20, 10, 0, 0)); UILabel beforeDesensitize = new UILabel(Toolkit.i18nText("Fine-Design_Report_Desensitization_Before")); UITextField beforeDesensitizeText = new UITextField(20); @@ -105,19 +111,14 @@ public class DesensitizationRuleDebugPane extends BasicPane { } }); - JComponent[][] components = new JComponent[][]{ - {beforeDesensitize, beforeDesensitizeText, desensitizeButton}, - {afterDesensitize, afterDesensitizeText, new UILabel()} - }; - panel.add( - TableLayoutHelper.createCommonTableLayoutPane( - components, - new double[]{TableLayout.PREFERRED, TableLayout.PREFERRED}, - new double[]{TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED}, - 20), - BorderLayout.CENTER); + beforeDesensitize.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); + afterDesensitize.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); + panel.add(column(10, + row(cell(beforeDesensitize), cell(beforeDesensitizeText).weight(0.6), flex(0.02), cell(desensitizeButton).weight(0.2), flex()), + row(cell(afterDesensitize), cell(afterDesensitizeText).weight(0.82), flex()) + ).getComponent()); - centerPane.add(panel); + centerPane.add(FineUIUtils.wrapComponentWithTitle(panel, Toolkit.i18nText("Fine-Design_Report_Desensitization_Rule_Debug"))); return centerPane; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRulePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRulePane.java index ba8b00d735..10c405f1c1 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRulePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRulePane.java @@ -1,5 +1,6 @@ package com.fr.design.data.datapane.preview.desensitization.view.rule; +import com.fine.theme.utils.FineUIUtils; import com.fr.data.desensitize.rule.base.DesensitizationRule; import com.fr.data.desensitize.rule.base.DesensitizationRuleSource; import com.fr.design.beans.BasicBeanPane; @@ -11,6 +12,9 @@ import javax.swing.JPanel; import java.awt.BorderLayout; import java.util.Map; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + /** * 脱敏规则展示页 * @@ -49,14 +53,14 @@ public class DesensitizationRulePane extends BasicBeanPane private void initPane() { // 内容面板 contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - contentPane.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Report_Desensitization_Rule_Choose"))); this.add(contentPane, BorderLayout.CENTER); // 规则来源选择Pane ruleSourceChoosePane = new DesensitizationRuleSourceChoosePane(this); // 规则选择Pane ruleChoosePane = new DesensitizationRuleChoosePane(latestRules); - contentPane.add(ruleSourceChoosePane, BorderLayout.NORTH); - contentPane.add(ruleChoosePane, BorderLayout.CENTER); + + contentPane.add(FineUIUtils.wrapComponentWithTitle(column(10, cell(ruleSourceChoosePane), cell(ruleChoosePane)).getComponent(), + Toolkit.i18nText("Fine-Design_Report_Desensitization_Rule_Choose"))); } /** diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java index 52b7e5b19b..32959ef942 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java @@ -1,5 +1,9 @@ package com.fr.design.data.datapane.preview.desensitization.view.setting; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.data.desensitize.base.DesensitizationTableData; import com.fr.data.desensitize.base.TableDataDesensitizationItem; import com.fr.data.desensitize.rule.DesensitizationRuleManager; @@ -10,6 +14,7 @@ import com.fr.design.data.datapane.preview.desensitization.view.rule.Desensitiza import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.icombobox.ComboCheckBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombocheckbox.UIComboCheckBox; import com.fr.design.gui.ilable.UILabel; @@ -24,10 +29,12 @@ import com.fr.stable.StringUtils; import org.jetbrains.annotations.Nullable; import javax.swing.AbstractCellEditor; +import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; @@ -277,6 +284,9 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter { private UITextField classNameTextField; private UITableEditorPane editorPane; public ClassTableDataPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); - - // TableLayout - double p = TableLayout.PREFERRED; - - double[] rowSize = {p, p, p, p}; - double[] columnSize = {p, p}; - //Reportlet. - JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - classNameTextField = new UITextField(36); - reportletNamePane.add(classNameTextField); + // 数据集默认参数 + editorPane = new UITableEditorPane(new ParameterTableModel() { + @Override + public UITableEditAction[] createAction() { + return new UITableEditAction[]{ + new AddParaAction(), + new RemoveParaAction() + }; + } + }, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Default_Para")); + this.add(column(cell(initNorthPanel()), fix(LayoutConstants.VERTICAL_GAP), cell(editorPane).weight(1)).getComponent()); + } + private JPanel initNorthPanel() { + //类名 + classNameTextField = new UITextField(); UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")); - browserButton.setPreferredSize(new Dimension( - browserButton.getPreferredSize().width, - classNameTextField.getPreferredSize().height)); - reportletNamePane.add(browserButton); + browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); browserButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { final ClassNameSelectPane bPane = new ClassNameSelectPane(); @@ -59,50 +63,42 @@ public class ClassTableDataPane extends AbstractTableDataPane { BasicDialog dlg= bPane.showWindow( (Dialog) SwingUtilities.getWindowAncestor(ClassTableDataPane.this), new DialogActionAdapter() { - public void doOk() { - String classPath = bPane.getClassPath(); - ClassTableData tableData = new ClassTableData(classPath); - populateBean(tableData); - } - }); + public void doOk() { + String classPath = bPane.getClassPath(); + ClassTableData tableData = new ClassTableData(classPath); + populateBean(tableData); + } + }); dlg.setVisible(true); } }); - Component[][] components = { - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_The_Class_Must_Implement_The_Interface") + "\"com.fr.data.Tabledata\"")}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, - {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} - }; - JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - this.add(northPane, BorderLayout.NORTH); - this.add(initSouthPanel(), BorderLayout.SOUTH); + return column(LayoutConstants.VERTICAL_GAP, + row(LayoutConstants.HGAP_LARGE, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name"))).weight(0.12), + row(LayoutConstants.HGAP_LARGE, cell(classNameTextField).weight(0.85), cell(browserButton).weight(0.15)).weight(0.58), + flex(0.3) + ), + row(LayoutConstants.HGAP_LARGE, flex(0.12), cell(getTipPanel()).weight(0.88)) + ).getComponent(); } - private JPanel initSouthPanel() { - JPanel jpanel = new JPanel(); - jpanel.setPreferredSize(new Dimension(-1, 150)); - jpanel.setLayout(new BorderLayout()); - editorPane = new UITableEditorPane(new ParameterTableModel() { - @Override - public UITableEditAction[] createAction() { - return new UITableEditAction[]{ - new AddParaAction(), - new RemoveParaAction() - }; - } - }, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Default_Para")); - - jpanel.add(editorPane, BorderLayout.CENTER); - - return jpanel; + private JPanel getTipPanel() { + return column( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_The_Class_Must_Implement_The_Interface") + + "\"com.fr.data.Tabledata\"", FineUIStyle.LABEL_TIP)), + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", + StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)), FineUIStyle.LABEL_TIP)), + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Example") + + ":\"com.fr.data.impl.ArrayTableData\"", FineUIStyle.LABEL_TIP)) + ).getComponent(); } + public class AddParaAction extends UITableEditAction { public AddParaAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); - this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); + this.setSmallIcon(new LazyIcon("add")); } @Override @@ -120,7 +116,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { private class RemoveParaAction extends UITableEditAction { public RemoveParaAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); - this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/remove.png")); + this.setSmallIcon(new LazyIcon("remove")); } public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index ae430b26e3..32dc440a3d 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -1,5 +1,9 @@ package com.fr.design.data.tabledata.tabledatapane; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.Parameter; import com.fr.base.ParameterHelper; import com.fr.data.core.db.TableProcedure; @@ -43,7 +47,6 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.ParameterUtils; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.esd.core.strategy.config.StrategyConfig; import com.fr.esd.core.strategy.config.StrategyConfigHelper; import com.fr.esd.core.strategy.config.service.StrategyConfigService; @@ -53,7 +56,6 @@ import com.fr.esd.event.DsNameTarget; import com.fr.esd.event.StrategyEventsNotifier; import com.fr.esd.query.StrategicTableData; import com.fr.general.ComparatorUtils; -import com.fr.general.IOUtils; import com.fr.general.sql.SqlUtils; import com.fr.log.FineLoggerFactory; import com.fr.script.Calculator; @@ -61,6 +63,8 @@ import com.fr.stable.ArrayUtils; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; import com.fr.workspace.WorkContext; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import org.jetbrains.annotations.NotNull; import javax.swing.BorderFactory; @@ -71,6 +75,7 @@ import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JToolBar; import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.text.BadLocationException; import javax.swing.text.Document; import java.awt.BorderLayout; @@ -86,6 +91,9 @@ import java.awt.event.KeyListener; import java.util.ArrayList; import java.util.List; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; + /** * @author rinoux * @version 10.0 @@ -93,7 +101,7 @@ import java.util.List; */ public class DBTableDataPane extends AbstractTableDataPane implements SwitchableTableDataPane { - private static final int BOTTOM = 6; + private static final int BOTTOM = 10; private static final String PREVIEW_BUTTON = Toolkit.i18nText("Fine-Design_Basic_Preview"); private static final String REFRESH_BUTTON = Toolkit.i18nText("Fine-Design_Basic_Refresh"); private ConnectionTableProcedurePane connectionTableProcedurePane; @@ -149,7 +157,7 @@ public class DBTableDataPane extends AbstractTableDataPane implemen } private void init() { - contentPane.setLayout(new BorderLayout(4, 4)); + contentPane.setLayout(FRGUIPaneFactory.createScaledBorderLayout(4, 4)); this.sqlTextPane = new SQLEditPane(); this.sqlTextPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL); @@ -162,7 +170,25 @@ public class DBTableDataPane extends AbstractTableDataPane implemen }; editorPane = new UITableEditorPane<>(model); + initConnectionTableProcedurePane(); + + this.sqlTextPane.addFocusListener(new FocusListener() { + @Override + public void focusGained(FocusEvent e) { + barErrorTips.setVisible(false); + } + + + @Override + public void focusLost(FocusEvent e) { + if (DBTableDataPane.this.isPreviewOrRefreshButton(e)) { + DBTableDataPane.this.checkParameter(); + } + } + }); + } + private void initConnectionTableProcedurePane() { this.connectionTableProcedurePane = new ConnectionTableProcedurePane(this) { @Override protected void filter(Connection connection, String conName, List nameList) { @@ -172,7 +198,6 @@ public class DBTableDataPane extends AbstractTableDataPane implemen }); } - @Override protected void addKeyMonitor() { this.searchField.addKeyListener(new KeyListener() { @@ -196,6 +221,10 @@ public class DBTableDataPane extends AbstractTableDataPane implemen }); } }; + + addConnectionTableProcedurePaneListener(); + } + private void addConnectionTableProcedurePaneListener() { this.connectionTableProcedurePane.addDoubleClickListener(new ConnectionTableProcedurePane.DoubleClickSelectedNodeOnTreeListener() { @Override public void actionPerformed(TableProcedure target) { @@ -210,40 +239,26 @@ public class DBTableDataPane extends AbstractTableDataPane implemen DBTableDataPane.this.sqlTextPane.requestFocus(); } }); - - this.sqlTextPane.addFocusListener(new FocusListener() { - @Override - public void focusGained(FocusEvent e) { - barErrorTips.setVisible(false); - } - - - @Override - public void focusLost(FocusEvent e) { - if (DBTableDataPane.this.isPreviewOrRefreshButton(e)) { - DBTableDataPane.this.checkParameter(); - } - } - }); } private void initMainSplitPane() { Box box = new Box(BoxLayout.Y_AXIS); - - JPanel northPane = new JPanel(new BorderLayout(4, 4)); + JPanel northPane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(4, 4)); JToolBar editToolBar = createToolBar(); + editToolBar.setBorder(null); northPane.add(editToolBar, BorderLayout.CENTER); - northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM, 0)); + northPane.setBorder(new ScaledEmptyBorder(0, 0, BOTTOM, 0)); RTextScrollPane sqlTextScrollPane = new RTextScrollPane(this.sqlTextPane); sqlTextScrollPane.setLineNumbersEnabled(true); - sqlTextScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); - sqlTextScrollPane.setPreferredSize(new Dimension(680, 600)); + sqlTextScrollPane.setBorder(new UIRoundedBorder(UIManager.getColor("defaultBorderColor"), 1, UIConstants.ARC)); + sqlTextScrollPane.setPreferredSize(FineUIScale.scale(new Dimension(680, 600))); JPanel paraMeanPane = new JPanel(new BorderLayout()); - paraMeanPane.setPreferredSize(new Dimension(680, 90)); + paraMeanPane.setBorder(new ScaledEmptyBorder(10, 0, BOTTOM, 0)); UILabel paraMean = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Param_DES")); + FineUIStyle.setStyle(paraMean, FineUIStyle.LABEL_TIP); paraMeanPane.add(paraMean, BorderLayout.CENTER); @@ -252,17 +267,16 @@ public class DBTableDataPane extends AbstractTableDataPane implemen box.add(paraMeanPane); box.add(this.editorPane); - JPanel sqlSplitPane = new JPanel(new BorderLayout(4, 4)); + JPanel sqlSplitPane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(4, 4)); sqlSplitPane.add(box, BorderLayout.CENTER); - box.setMinimumSize(new Dimension(300, 400)); + box.setMinimumSize(FineUIScale.scale(new Dimension(300, 400))); - this.connectionTableProcedurePane.setMinimumSize(new Dimension(230, 400)); - this.connectionTableProcedurePane.setMaximumSize(new Dimension(500, 400)); + this.connectionTableProcedurePane.setMinimumSize(FineUIScale.scale(new Dimension(230, 400))); + this.connectionTableProcedurePane.setMaximumSize(FineUIScale.scale(new Dimension(500, 400))); JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, this.connectionTableProcedurePane, sqlSplitPane); - mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); mainSplitPane.setOneTouchExpandable(true); contentPane.add(mainSplitPane, BorderLayout.CENTER); } @@ -326,13 +340,19 @@ public class DBTableDataPane extends AbstractTableDataPane implemen private void createToolbarEsdComponents(final UIToolbar editToolBar) { this.esdSettingsLabel = new UILabel(Toolkit.i18nText("Fine-Design_ESD_Cache_Settings")); + esdSettingsLabel.setBorder(new ScaledEmptyBorder(0, 6, 0,6)); this.esdConfigOption = new UIComboBox(StrategyConfigFrom.values()); + this.esdConfigOption.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); this.esdEnabled = new UICheckBox(Toolkit.i18nText("Fine-Design_ESD_Enable_Cache")); + esdEnabled.setBorder(new ScaledEmptyBorder(0, 6, 0,6)); this.barErrorTips = new UILabel(); - this.barErrorTips.setForeground(Color.RED); + barErrorTips.setBorder(new ScaledEmptyBorder(0, 6, 0,6)); + FineUIStyle.setStyle(barErrorTips, FineUIStyle.LABEL_WARNING_TIP); this.barErrorTips.setVisible(false); esdSettingsBtn = new UIButton(Toolkit.i18nText("Fine-Design_ESD_Strategy_Config")); + esdSettingsBtn.setPreferredSize(new Dimension((int) esdSettingsBtn.getPreferredSize().getWidth(), FineUIScale.scale(24))); + FineUIStyle.setStyle(esdSettingsBtn, FineUIStyle.WHITE_BUTTON); esdSettingsBtn.addActionListener(new ActionListener() { @Override @@ -575,7 +595,7 @@ public class DBTableDataPane extends AbstractTableDataPane implemen protected class RefreshAction extends UITableEditAction { public RefreshAction() { setName(REFRESH_BUTTON); - setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/refresh.png")); + setSmallIcon(new LazyIcon("refresh")); } @@ -594,7 +614,7 @@ public class DBTableDataPane extends AbstractTableDataPane implemen public PreviewAction() { setName(PREVIEW_BUTTON); setMnemonic('P'); - setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_file/preview.png")); + setSmallIcon(new LazyIcon("preview")); } @@ -609,7 +629,7 @@ public class DBTableDataPane extends AbstractTableDataPane implemen public PreviewPerformedSQLAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview_Performed_Sql")); - this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_file/preview_sql.png")); + this.setSmallIcon(new LazyIcon("preview_sql")); } @Override @@ -623,7 +643,7 @@ public class DBTableDataPane extends AbstractTableDataPane implemen public EditPageQueryAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Layer_Page_Report_Page_Query")); this.setMnemonic('L'); - this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_file/text.png")); + this.setSmallIcon(new LazyIcon("page_query")); } @Override @@ -638,6 +658,12 @@ public class DBTableDataPane extends AbstractTableDataPane implemen checkParameter(); } }); + dialog.addWindowListener(new WindowAdapter() { + @Override + public void windowActivated(WindowEvent e) { + dialog.toFront(); + } + }); dialog.setVisible(true); } } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java index 731816243e..8ab58d8603 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java @@ -1,22 +1,24 @@ package com.fr.design.data.tabledata.tabledatapane; +import com.fine.theme.utils.FineUIScale; import com.fr.data.impl.EmbeddedTableData; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.date.UIDatePicker; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.icontainer.UITableScrollPane; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.general.DateUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; import javax.swing.DefaultCellEditor; import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumn; @@ -32,17 +34,22 @@ import java.awt.event.MouseEvent; import java.text.SimpleDateFormat; import java.util.Date; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; public class EmbeddedTableDataPane extends AbstractTableDataPane { private static final int MIN_CELL_WIDTH = 30; + private static final int PREVIEW_TABLE_MIN_COLUMN_WIDTH = FineUIScale.scale(75); + private static final int PREVIEW_TABLE_WIDTH = FineUIScale.scale(600); private JTable dataJTable ; - private JScrollPane scrollPane; + private UITableScrollPane scrollPane; private UILabel coordinatelabel; private UIButton insertRowButton; private UIButton removeRowButton; - private UIButton columnSetButton; - /** + /** * Constructor * */ @@ -52,12 +59,12 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane 1); + removeRowButton.setEnabled(dataJTable.getRowCount() > 0); + } + @Override protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Embedded_TableData"); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java index 5d9d4146d6..447bb82e50 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java @@ -1,6 +1,9 @@ package com.fr.design.data.tabledata.tabledatapane; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.Parameter; import com.fr.base.ParameterHelper; import com.fr.base.Utils; @@ -12,6 +15,7 @@ import com.fr.data.impl.FileTableData; import com.fr.data.impl.TextTableData; import com.fr.data.impl.XMLTableData; import com.fr.design.actions.UpdateAction; +import com.fr.design.constants.LayoutConstants; import com.fr.design.data.datapane.preview.PreviewTablePane; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.FineJOptionPane; @@ -27,9 +31,6 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; @@ -47,7 +48,6 @@ import com.fr.stable.StringUtils; import com.fr.stable.xml.XMLReadable; import com.fr.stable.xml.XMLableReader; -import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.JOptionPane; import javax.swing.JPanel; @@ -62,9 +62,7 @@ import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Component; import java.awt.Dimension; -import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -80,6 +78,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; +import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle; + public class FileTableDataPane extends AbstractTableDataPane { private static final int TEXT = 0; private static final int EXCEL = 1; @@ -96,7 +103,7 @@ public class FileTableDataPane extends AbstractTableDataPane { private UIRadioButton localFileRadioButton; private UIRadioButton urlFileRadioButton; private UITableEditorPane editorPane; - private UILabel tips; + private JPanel tipPanel; private UIComboBox xmlKyePoint;// xml关键节点 private UIComboBox encodingComboBox;// xml编码 private FileTableData fileTableData; @@ -104,8 +111,6 @@ public class FileTableDataPane extends AbstractTableDataPane { private UIButton testConnection; private XMLNodeTree xmlNodeTree; private Parameter[] params; - private JPanel filePath; - private XMLNodeTreePane nodeTreePane; private UICheckBox needColumnNameCheckBox;// 第一行是否作为标题 private UIRadioButton tableDismemberRadioButton;// 制表符 @@ -116,41 +121,31 @@ public class FileTableDataPane extends AbstractTableDataPane { private UICheckBox ignoreOneMoreDelimiterCheckBox;// 连续分隔符是否作为单一 private UIComboBox charsetComboBox; private UILabel encodeLabel; - private UILabel dismenberLabel; private UILabel keyPointLaber; private ExpandMutableTreeNode selectedNode = null; private ExpandMutableTreeNode finalSelectedNode = null; - private ArrayList xmlColumnsList = new ArrayList(); - private static final int SETPANELWIDTH = 337; - private static final int WIDTH = 317; - private static final int HEIGHT = 453; - private static final int GAP = 23; - + private static final double LOCAL_WIDTH_RATIO = 0.62; + private static final double URL_WIDTH_RATIO = 0.56; public FileTableDataPane() { - this(SETPANELWIDTH, WIDTH, HEIGHT, GAP); + this(LOCAL_WIDTH_RATIO, URL_WIDTH_RATIO); } - public FileTableDataPane(int setPanelWidth, int width, int height, int gap) { - this.setLayout(new BorderLayout(gap, 0)); - JPanel northPanel = new JPanel(new BorderLayout()); - JPanel type = new JPanel(); - type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":")); + public FileTableDataPane(double localWidthRatio, double urlWidthRatio) { + this.setLayout(new BorderLayout()); + //文件类型 + JPanel fileType = new JPanel(new BorderLayout()); String[] item = {"TXT", "Excel", "XML"}; fileTypeComboBox = new UIComboBox(item); - fileTypeComboBox.setPreferredSize(new Dimension(100, 20)); - type.add(fileTypeComboBox); - northPanel.add(type, BorderLayout.WEST); - - // 最上面的pane，文件选择 - JPanel centerPanel = new JPanel(); - centerPanel.setPreferredSize(new Dimension(522, 200)); - centerPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File_Address"))); - addToCenterPanel(centerPanel); + fileTypeComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + fileType.add(row(LayoutConstants.HGAP_LARGE, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type"))).weight(0.12), + row(cell(fileTypeComboBox), flex()).weight(0.88) + ).getComponent()); - // 下面的pane，参数面板 + //参数面板 ParameterTableModel model = new ParameterTableModel() { @Override public UITableEditAction[] createAction() { @@ -158,65 +153,74 @@ public class FileTableDataPane extends AbstractTableDataPane { } }; editorPane = new UITableEditorPane(model); - editorPane.setPreferredSize(new Dimension(355, 130)); - centerPanel.add(editorPane, BorderLayout.SOUTH); - - JPanel southPanel = new JPanel(new BorderLayout()); - JPanel setPanel = new JPanel(); - southPanel.add(setPanel, BorderLayout.CENTER); - setPanel.setPreferredSize(new Dimension(setPanelWidth, 460)); - setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"))); - JPanel controlPane = textSetPanel(width, height); - setPanel.add(controlPane, BorderLayout.NORTH); - fileTypeComboBox.addActionListener(getFileTypeListener(setPanel, width, height)); - - this.add(northPanel, BorderLayout.NORTH); - this.add(centerPanel, BorderLayout.CENTER); - this.add(southPanel, BorderLayout.EAST); + + //左侧文件地址pane + JPanel leftPanel = new JPanel(new BorderLayout()); + leftPanel.add(column( + LayoutConstants.VERTICAL_GAP, + cell(getCenterPanel(localWidthRatio, urlWidthRatio)), + cell(editorPane).weight(1) + ).getComponent()); + //右侧设定pane + JPanel rightPanel = new JPanel(new BorderLayout()); + rightPanel.add(getTextSetPanel()); + fileTypeComboBox.addActionListener(getFileTypeListener(rightPanel)); + + //文件数据集整体布局，服务器数据集/模板数据集下的文件数据集，创建文件数据集，三处面板通用布局 + this.add(column(LayoutConstants.VERTICAL_GAP, + cell(fileType), + row(20, + cell(wrapComponentWithTitle(leftPanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File_Address"))).weight(0.55), + cell(wrapComponentWithTitle(rightPanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"))).weight(0.45) + ).weight(1) + ).getComponent()); } - private void addToCenterPanel(JPanel centerPanel) { - localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_File") + ":", true); - urlFileRadioButton = new UIRadioButton("URL:", false); + /** + * 文件地址上方的面板-文件选择 + * @return JPanel + */ + private JPanel getCenterPanel(double localWidthRatio, double urlWidthRatio) { + // 本地文件/URL + localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_File"), true); + urlFileRadioButton = new UIRadioButton("URL", false); ButtonGroup bg = new ButtonGroup(); bg.add(localFileRadioButton); bg.add(urlFileRadioButton); localFileRadioButton.addActionListener(radioActionListener); urlFileRadioButton.addActionListener(radioActionListener); - urlFileRadioButton.setForeground(new Color(143, 142, 139)); - localFileRadioButton.setForeground(Color.black); localText = new UITextField(); - localText.setPreferredSize(new Dimension(195, 20)); urlText = new UITextField(); - urlText.setPreferredSize(new Dimension(195, 20)); urlText.setEditable(false); + // 选择按钮 chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Selection")); chooseFile.addActionListener(chooseFileListener); - + // 测试连接按钮 testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection")); testConnection.setEnabled(false); - testConnection.addActionListener(testConnectionListener);// 测试连接按钮 - - JPanel textPanel = new JPanel(new GridLayout(2, 1, 15, 15)); - JPanel textFieldPanel = new JPanel(new GridLayout(2, 1, 15, 15)); - JPanel buttonPanel = new JPanel(new GridLayout(2, 1, 15, 15)); - textPanel.add(localFileRadioButton); - textPanel.add(urlFileRadioButton); - textFieldPanel.add(localText); - textFieldPanel.add(urlText); - buttonPanel.add(chooseFile); - buttonPanel.add(testConnection); - filePath = FRGUIPaneFactory.createBorderLayout_S_Pane(); - filePath.add(textPanel, BorderLayout.WEST); - filePath.add(textFieldPanel, BorderLayout.CENTER); - filePath.add(buttonPanel, BorderLayout.EAST); - centerPanel.add(filePath, BorderLayout.NORTH); - - // 中间的pane，提示信息 - String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter") + "reportlets/excel/FineReport${abc}." + "txt" + "
" - + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp
" + "  "; - tips = new UILabel(tipContent); - centerPanel.add(tips, BorderLayout.CENTER); + testConnection.addActionListener(testConnectionListener); + // 提示信息 + tipPanel = column( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter_Desc"), FineUIStyle.LABEL_TIP)), + cell(new UILabel("reportlets/excel/FineReport${abc}." + "txt", FineUIStyle.LABEL_TIP)), + cell(new UILabel("http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp", FineUIStyle.LABEL_TIP)) + ).getComponent(); + return column( + LayoutConstants.VERTICAL_GAP, + row( + LayoutConstants.HGAP_LARGE, + cell(localFileRadioButton).weight(0.25), + cell(localText).weight(localWidthRatio), + cell(chooseFile).weight(0.75 - localWidthRatio) + ), + row( + LayoutConstants.HGAP_LARGE, + cell(urlFileRadioButton).weight(0.25), + cell(urlText).weight(urlWidthRatio), + cell(testConnection).weight(0.75 - urlWidthRatio) + ), + cell(tipPanel) + ).getComponent(); } private ActionListener testConnectionListener = new ActionListener() { @@ -249,7 +253,7 @@ public class FileTableDataPane extends AbstractTableDataPane { } }; - private void previewPanel(JPanel jPanel) { + private JPanel getPreviewPanel() { JPanel previewPanel = new JPanel(new BorderLayout()); UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); preview.addActionListener(new ActionListener() { @@ -259,56 +263,37 @@ public class FileTableDataPane extends AbstractTableDataPane { } }); previewPanel.add(preview, BorderLayout.EAST); - jPanel.add(previewPanel, BorderLayout.SOUTH); + return previewPanel; } - private JPanel xmlSetPanel(int width, int height) { + /** + * XML设定Pane + * @return + */ + private JPanel getXmlSetPanel() { // xml设置pane - JPanel controlPane = new JPanel(); - JPanel northPane = new JPanel(new BorderLayout(8, 8)); - JPanel northTopPane = new JPanel(new BorderLayout(8, 8)); - JPanel southPane = new JPanel(new BorderLayout(8, 8)); - JPanel southTopPane = new JPanel(new BorderLayout(8, 8)); - controlPane.setLayout(new BorderLayout(8, 8)); - controlPane.setPreferredSize(new Dimension(width, height)); - JPanel comboboxPanel = new JPanel(new BorderLayout(8, 8)); - encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":"); + encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type")); encodingComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY); encodingComboBox.setSelectedIndex(4); - encodingComboBox.setPreferredSize(new Dimension(90, 20)); - - JPanel treeContainerPane = new JPanel(); - treeContainerPane.setLayout(new BorderLayout(8, 8)); - nodeTreePane = new XMLNodeTreePane(); - treeContainerPane.add(nodeTreePane, BorderLayout.CENTER); - - - comboboxPanel.add(encodeLabel, BorderLayout.WEST); - comboboxPanel.add(encodingComboBox, BorderLayout.CENTER); - - northPane.add(comboboxPanel, BorderLayout.EAST); - northTopPane.add(northPane, BorderLayout.WEST); - southTopPane.add(southPane, BorderLayout.WEST); - southTopPane.add(treeContainerPane, BorderLayout.CENTER); - controlPane.add(northTopPane, BorderLayout.NORTH); - controlPane.add(southTopPane, BorderLayout.CENTER); - previewPanel(controlPane); - return controlPane; + JPanel xmlSetPanel = new JPanel(new BorderLayout()); + xmlSetPanel.add(column( + LayoutConstants.VGAP_MEDIUM, + row(LayoutConstants.HORIZONTAL_GAP, cell(encodeLabel).weight(0.2), cell(encodingComboBox).weight(0.8)), + cell(new XMLNodeTreePane()).weight(1), + cell(getPreviewPanel()) + ).getComponent()); + return xmlSetPanel; } - private JPanel excelSetPanel(int width, int height) { - // excel设置pane - int checkBoxWidth = width - EIGHT; - JPanel controlPane = new JPanel(); - JPanel northPane = new JPanel(new BorderLayout(8, 8)); - controlPane.setLayout(new BorderLayout()); - controlPane.setPreferredSize(new Dimension(width, height)); + /** + * Excel设定Pane + * @return + */ + private JPanel getExcelSetPanel() { needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), false); - needColumnNameCheckBox.setPreferredSize(new Dimension(checkBoxWidth, 20)); - northPane.add(needColumnNameCheckBox, BorderLayout.EAST); - controlPane.add(northPane, BorderLayout.NORTH); - previewPanel(controlPane); - return controlPane; + JPanel excelSetPanel = new JPanel(new BorderLayout()); + excelSetPanel.add(column(cell(needColumnNameCheckBox), flex(1), cell(getPreviewPanel())).getComponent()); + return excelSetPanel; } private String getFilePathFromUrlOrLocal() { @@ -346,34 +331,33 @@ public class FileTableDataPane extends AbstractTableDataPane { // return (uri.matches("https*://.+|\\$\\{.+\\}.*")); } - private JPanel textSetPanel(int width, int height) { - // text设置pane - JPanel controlPane = new JPanel(); - controlPane.setLayout(new BorderLayout()); - controlPane.setPreferredSize(new Dimension(width, height)); - JPanel northPane = new JPanel(new BorderLayout(8, 8)); - addToNorthPane(northPane); - controlPane.add(northPane, BorderLayout.WEST); - previewPanel(controlPane); - return controlPane; + /** + * TXT设定Pane + * @return + */ + private JPanel getTextSetPanel() { + initRatioButton(); + //编码类型 + encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type")); + charsetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY); + JPanel textSetPanel = new JPanel(new BorderLayout()); + textSetPanel.add(column(cell(getTxtCenterPane()), flex(1), cell(getPreviewPanel())).getComponent()); + return textSetPanel; } - private void addToNorthPane(JPanel northPane) { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] columnSize = {f, p, p}; - double[] rowSize = {B, B, B, B, B, B, B}; - needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), true); - dismenberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dismenber") + ":"); + /** + * 初始化Button + */ + private void initRatioButton(){ tableDismemberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Dismember"), false); tableDismemberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Dismember")); spaceDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Space"), true); spaceDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Space")); commaDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Comma_Dismenber"), false); commaDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Comma_Dismenber")); - otherDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other") + ":", false); + otherDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other"), false); otherDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other")); - otherDismenberTextField = new UITextField(8); + otherDismenberTextField = new UITextField(); otherDismenberTextField.setEditable(false); otherDismenberRadioButton.addChangeListener(new ChangeListener() { @Override @@ -385,6 +369,7 @@ public class FileTableDataPane extends AbstractTableDataPane { } } }); + needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), true); ButtonGroup bg2 = new ButtonGroup(); bg2.add(tableDismemberRadioButton); bg2.add(spaceDismenberRadioButton); @@ -392,18 +377,38 @@ public class FileTableDataPane extends AbstractTableDataPane { bg2.add(otherDismenberRadioButton); ignoreOneMoreDelimiterCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Series_Dismenber_As_Single"), true); UIComponentUtils.setLineWrap(ignoreOneMoreDelimiterCheckBox); - encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":"); - charsetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY); - Component[][] comps = { - {encodeLabel, charsetComboBox, null}, - {needColumnNameCheckBox, null, null}, - {dismenberLabel, tableDismemberRadioButton, null}, - {null, spaceDismenberRadioButton, null}, - {null, commaDismenberRadioButton, null}, - {null, otherDismenberRadioButton, otherDismenberTextField}, - {ignoreOneMoreDelimiterCheckBox, null, null} - }; - northPane.add(TableLayoutHelper.createTableLayoutPane(comps, rowSize, columnSize), BorderLayout.EAST); + } + + + /** + * 获取TXT中心Pane + * @return + */ + private JPanel getTxtCenterPane(){ + //分隔符选项 + JPanel separatorOptionsPanel = column( + LayoutConstants.VERTICAL_GAP, + cell(tableDismemberRadioButton), + cell(spaceDismenberRadioButton), + cell(commaDismenberRadioButton), + row(cell(otherDismenberRadioButton), fix(20), cell(otherDismenberTextField).weight(1)) + ).getComponent(); + //TXT设定主要面板 + return column( + LayoutConstants.VERTICAL_GAP, + row(10, cell(encodeLabel).weight(0.2), cell(charsetComboBox).weight(0.8)), + cell(needColumnNameCheckBox), + row(10, + cell(getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dismenber"))).weight(0.2), + cell(separatorOptionsPanel).weight(0.8) + ), + cell(ignoreOneMoreDelimiterCheckBox) + ).getComponent(); + } + + private JPanel getTopAlignLabelPane(String labelText) { + return column(LayoutConstants.VERTICAL_GAP, cell(new UILabel(labelText))) + .with(it-> it.setBorder(new ScaledEmptyBorder(2,0,0,0))).getComponent(); } private ActionListener radioActionListener = new ActionListener() { @@ -480,24 +485,26 @@ public class FileTableDataPane extends AbstractTableDataPane { return suffixToString; } - private ActionListener getFileTypeListener(final JPanel setPanel, final int width, final int height) { + private ActionListener getFileTypeListener(final JPanel rightPanel) { ActionListener fileTypeListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - setPanel.removeAll(); + rightPanel.removeAll(); localText.setText(""); urlText.setText(""); if (fileTypeComboBox.getSelectedIndex() == XML) { - setPanel.add(xmlSetPanel(width, height), BorderLayout.NORTH); + rightPanel.add(getXmlSetPanel()); } else if (fileTypeComboBox.getSelectedIndex() == EXCEL) { - setPanel.add(excelSetPanel(width, height), BorderLayout.NORTH); + rightPanel.add(getExcelSetPanel()); } else { - setPanel.add(textSetPanel(width, height), BorderLayout.NORTH); + rightPanel.add(getTextSetPanel()); } - String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "
" - + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp
" + "  "; - tips.setText(tipContent); - setPanel.revalidate(); + tipPanel = column( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter_Desc"), FineUIStyle.LABEL_TIP)), + cell(new UILabel("reportlets/excel/FineReport${abc}." + getFileSuffixToString(), FineUIStyle.LABEL_TIP)), + cell(new UILabel("http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp", FineUIStyle.LABEL_TIP)) + ).getComponent(); + rightPanel.revalidate(); } }; @@ -507,7 +514,7 @@ public class FileTableDataPane extends AbstractTableDataPane { private class RefreshAction extends UITableEditAction { public RefreshAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh")); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); + this.setSmallIcon(new LazyIcon("refresh")); } @Override @@ -818,16 +825,16 @@ public class FileTableDataPane extends AbstractTableDataPane { JPanel toolbarPanel = new JPanel(new BorderLayout()); this.setLayout(new BorderLayout()); xmlNodeTree = new XMLNodeTree(); + xmlNodeTree.setBackground(FlatUIUtils.getUIColor("fill.normal", Color.WHITE)); this.add(new JScrollPane(xmlNodeTree)); - keyPointLaber = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Key_Point") + ":"); + keyPointLaber = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Key_Point")); refreshAction = new RefreshParameterAction(); ToolBarDef toolbarDef = new ToolBarDef(); toolbarDef.addShortCut(refreshAction); UIToolbar toolBar = ToolBarDef.createJToolBar(); toolbarDef.updateToolBar(toolBar); - toolbarPanel.add(keyPointLaber, BorderLayout.WEST); - toolbarPanel.add(toolBar, BorderLayout.EAST); + toolbarPanel.add(row(cell(keyPointLaber), flex(), cell(toolBar)).getComponent()); this.add(toolbarPanel, BorderLayout.NORTH); } @@ -840,7 +847,7 @@ public class FileTableDataPane extends AbstractTableDataPane { public RefreshParameterAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Refresh")); this.setMnemonic('r'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); + this.setSmallIcon(new LazyIcon("refresh")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataSmallHeightPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataSmallHeightPane.java index 4ce5da98d6..06963c3810 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataSmallHeightPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataSmallHeightPane.java @@ -9,11 +9,10 @@ package com.fr.design.data.tabledata.tabledatapane; */ public class FileTableDataSmallHeightPane extends FileTableDataPane{ //wikky:文件数据集在模板数据集下面的界面参数。 - private static final int SETPANELWIDTH = 265; - private static final int WIDTH = 245; - private static final int HEIGHT = 475; - private static final int GAP = 13; + private static final double LOCAL_WIDTH_RATIO = 0.58; + private static final double URL_WIDTH_RATIO = 0.51; + public FileTableDataSmallHeightPane(){ - super(SETPANELWIDTH,WIDTH,HEIGHT,GAP); + super(LOCAL_WIDTH_RATIO, URL_WIDTH_RATIO); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataSmallPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataSmallPane.java index b81d2b904e..0c33c054af 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataSmallPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataSmallPane.java @@ -9,11 +9,10 @@ package com.fr.design.data.tabledata.tabledatapane; */ public class FileTableDataSmallPane extends FileTableDataPane{ //wikky:文件数据集在服务器数据集下面的界面参数。 - private static final int SETPANELWIDTH = 265; - private static final int WIDTH = 245; - private static final int HEIGHT = 436; - private static final int GAP = 13; + private static final double LOCAL_WIDTH_RATIO = 0.59; + private static final double URL_WIDTH_RATIO = 0.52; + public FileTableDataSmallPane(){ - super(SETPANELWIDTH,WIDTH,HEIGHT,GAP); + super(LOCAL_WIDTH_RATIO, URL_WIDTH_RATIO); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java index af2b71a7c6..d3e43724a9 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java @@ -15,6 +15,9 @@ import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.i18n.Toolkit; import com.fr.stable.StringUtils; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; + public class MaxMemRowCountPanel extends UIToolbar { private static final int ALL_IN_MEMORY = 0; @@ -71,6 +74,7 @@ public class MaxMemRowCountPanel extends UIToolbar { this.setRollover(true); this.setBackground(UIConstants.NORMAL_BACKGROUND); switchCache = new UIComboBox(CACHE_LIST); + switchCache.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); switchCache.addActionListener(switchStateL); numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1); numberSpinner.setNumberFieldColumns(3); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java index 66674f166a..25964be6d8 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java @@ -1,9 +1,13 @@ package com.fr.design.data.tabledata.tabledatapane; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.*; import com.fr.data.impl.ConditionTableData; import com.fr.data.impl.MultiTDTableData; import com.fr.data.impl.UnionTableData; +import com.fr.design.constants.LayoutConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper; @@ -24,11 +28,16 @@ import com.fr.script.Calculator; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; import javax.swing.Icon; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import java.awt.*; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.BorderLayout; +import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -39,6 +48,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map.Entry; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + public class MultiTDTableDataPane extends AbstractTableDataPane { private static final int MAX_LENTH_OF_DATASET = 130; //关联数据集面板最大显示的数据集长度，超出这个长度显示数据集名称+“...” @@ -52,28 +65,24 @@ public class MultiTDTableDataPane extends AbstractTableDataPane stringTableDataWrapperEntry : resMap.entrySet()) { TableDataWrapper tableDataWrappe = stringTableDataWrapperEntry.getValue(); @@ -103,7 +114,6 @@ public class MultiTDTableDataPane extends AbstractTableDataPane MAX_LENTH_OF_DATASET) { @@ -299,25 +302,40 @@ public class MultiTDTableDataPane extends AbstractTableDataPane(new StoreProcedureTableModel()); autoEditorPane = new UITableEditorPane(new AutoStoreProcedureTableModel()); autoEditorPane.getbuttonPane().setVisible(false); @@ -124,12 +131,12 @@ public class ProcedureDataPane extends AbstractTableDataPane imp // 左边的Panel,上面是选择DatabaseConnection的ComboBox,下面DatabaseConnection对应的Table initconnectionTableProcedurePane(); - this.setLayout(new BorderLayout(4, 4)); - connectionTableProcedurePane.setMinimumSize(new Dimension(155, 500)); - box.setMinimumSize(new Dimension(310, 400)); + this.setLayout(FRGUIPaneFactory.createScaledBorderLayout(4, 4)); + this.connectionTableProcedurePane.setMinimumSize(FineUIScale.scale(new Dimension(230, 400))); + this.connectionTableProcedurePane.setMaximumSize(FineUIScale.scale(new Dimension(500, 400))); + box.setMinimumSize(FineUIScale.scale(new Dimension(300, 400))); // 使用SplitPane JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, connectionTableProcedurePane, sqlSplitPane); - mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); mainSplitPane.setOneTouchExpandable(true); this.add(mainSplitPane, BorderLayout.CENTER); } @@ -168,8 +175,10 @@ public class ProcedureDataPane extends AbstractTableDataPane imp toolBarDef.addShortCut(new RefreshAction()); toolBarDef.addShortCut(SeparatorDef.DEFAULT); isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Is_Share_DBTableData")); + isShareCheckBox.setBorder(new ScaledEmptyBorder(0, 6, 0,6)); maxPanel = new MaxMemRowCountPanel(); maxPanel.setBorder(null); + maxPanel.setBackground(null); UIToolbar toolbar = ToolBarDef.createJToolBar(); toolBarDef.updateToolBar(toolbar); toolbar.add(isShareCheckBox); @@ -384,7 +393,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp public PreviewAction(ProcedureDataPane procedureDataPane) { this.setName(PREVIEW_BUTTON); this.setMnemonic('P'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png")); + this.setSmallIcon(new LazyIcon("preview")); this.procedureDataPane = procedureDataPane; } @@ -399,7 +408,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp protected class RefreshAction extends UITableEditAction { public RefreshAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh")); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); + this.setSmallIcon(new LazyIcon("refresh")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java index 804f9a22a5..7a21185511 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java @@ -1,5 +1,6 @@ package com.fr.design.data.tabledata.tabledatapane; +import com.fine.theme.icon.LazyIcon; import com.fr.data.TableDataSource; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.data.DesignTableDataManager; @@ -14,7 +15,7 @@ import com.fr.stable.Nameable; import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; -import javax.swing.*; +import javax.swing.DefaultListModel; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -101,7 +102,7 @@ public class ProcedureListPane extends JListControlPane { * @return 面板组件 */ public NameableCreator[] createNameableCreators() { - return new NameableCreator[] { new NameObjectCreator("Proc", "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, + return new NameableCreator[]{new NameObjectCreator("Proc", new LazyIcon("store_procedure"), StoreProcedure.class, ProcedureDataPane.class) }; } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java index e7b7e7026b..88f9b04239 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java @@ -1,5 +1,6 @@ package com.fr.design.data.tabledata.tabledatapane; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.BaseFormula; import com.fr.base.StoreProcedureParameter; import com.fr.data.impl.storeproc.StoreProcedureConstants; @@ -21,6 +22,11 @@ import java.awt.*; import java.util.Date; import java.util.HashMap; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + public class StoreProcedureParameterPane extends BasicPane { @@ -70,27 +76,25 @@ public class StoreProcedureParameterPane extends BasicPane { schemaCombo = new UIComboBox(); initUIComboBox(schemaCombo, schemaName); - JPanel namePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - namePane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.WEST); nameField = new UITextField(10); - namePane.add(nameField, BorderLayout.CENTER); - namePane.add(new UILabel(" "), BorderLayout.EAST); - valuePane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Default") + ":"), BorderLayout.WEST); - valuePane.add(valueEditPane, BorderLayout.CENTER); - valuePane.add(new UILabel(" "), BorderLayout.EAST); - Component[][] components = {{null}, - {namePane}, - {addPane("Fine-Design_Basic_Model", 1, schemaCombo)}, - {valuePane}, - {null} - }; - double p = TableLayout.PREFERRED; - double[] rowSize = {p, p, p, p, p, p}; - double[] columnSize = {p}; - JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane( - components, rowSize, columnSize, 20, 10); - this.add(centerPane, BorderLayout.CENTER); - + + this.add(FineUIUtils.wrapComponentWithTitle(column( + 10, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"))).weight(0.07), + cell(nameField).weight(0.2), + flex(0.2) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"))).weight(0.07), + cell(schemaCombo).weight(0.2), + flex(0.2) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Default"))).weight(0.07), + cell(valueEditPane).weight(0.2), + flex(0.2) + )).getComponent(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))); } private JPanel addPane(String s, int i, UIComboBox combo){ diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java index 845010cd55..2870bbcc34 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java @@ -35,7 +35,6 @@ public class StoreProcedureTableModel extends UITableModelAdapter, Icon> TABLE_DATA_ICON_PATHS = new HashMap<>(); - private static final String DEFAULT_MULTI_RESULT_TD_ICON = "/com/fr/design/standard/multi"; + private static final String DEFAULT_MULTI_RESULT_TD_ICON = "multi"; static { @@ -45,10 +45,10 @@ class MultiResultTableDataWrapperHelper { return TABLE_DATA_ICON_PATHS.computeIfAbsent(tableDataClass, cls -> { for (TableDataNameObjectCreator creator : TableDataCreatorProducer.getInstance().createReportTableDataCreator()) { if (creator.createObject().getClass().isAssignableFrom(tableDataClass)) { - return IconUtils.readIcon(creator.getIconPath()); + return creator.menuIcon(); } } - return IconUtils.readIcon(DEFAULT_MULTI_RESULT_TD_ICON); + return new LazyIcon(DEFAULT_MULTI_RESULT_TD_ICON); }); } } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java index cf66d9700e..fb02f1a3f8 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java @@ -1,8 +1,7 @@ package com.fr.design.data.tabledata.wrapper; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; -import com.fr.base.svg.IconUtils; import com.fr.base.svg.SVGLoader; import com.fr.data.impl.ClassTableData; import com.fr.data.impl.DBTableData; @@ -12,7 +11,7 @@ import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.icon.WarningIcon; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.Icon; public final class ServerTableDataWrapper extends AbstractTableDataWrapper { public ServerTableDataWrapper(TableData tabledata) { @@ -27,21 +26,21 @@ public final class ServerTableDataWrapper extends AbstractTableDataWrapper { public Icon getIcon() { if (tabledata instanceof DBTableData) { if (StringUtils.isBlank(((DBTableData) tabledata).getQuery())) { - return new WarningIcon(SVGLoader.load("/com/fr/design/standard/server_database_normal.svg")); + return new LazyIcon("server_database_warning"); } else { - return IconUtils.readIcon("/com/fr/design/standard/server_database"); + return new LazyIcon("server_database"); } } else if (tabledata instanceof ClassTableData) { - return IconUtils.readIcon("/com/fr/design/standard/class_table_data"); + return new LazyIcon("class_table_data"); } else if (tabledata instanceof EmbeddedTableData) { - return IconUtils.readIcon("/com/fr/design/standard/data_table"); + return new LazyIcon("data_table"); }else if(tabledata instanceof RecursionTableData){ - return IconUtils.readIcon("/com/fr/design/standard/tree"); + return new LazyIcon("tree"); } else if (tabledata instanceof StoreProcedure) { - return IconUtils.readIcon("/com/fr/design/standard/store_procedure"); + return new LazyIcon("store_procedure"); } - return IconUtils.readIcon("/com/fr/design/standard/server_database"); + return new LazyIcon("server_database"); } /** diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java index 4eec58c31e..e6d93a3d43 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java @@ -1,7 +1,7 @@ package com.fr.design.data.tabledata.wrapper; +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; -import com.fr.base.svg.IconUtils; import com.fr.data.impl.storeproc.ProcedureDataModel; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.data.operator.DataOperator; @@ -153,7 +153,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { @Override public Icon getIcon() { - return IconUtils.readIcon("/com/fr/design/standard/store_procedure"); + return new LazyIcon("store_procedure"); } /** diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java index c2c815e8a8..f13be4a0be 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java @@ -1,7 +1,7 @@ package com.fr.design.data.tabledata.wrapper; +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; -import com.fr.base.svg.IconUtils; import com.fr.data.impl.storeproc.ProcedureDataModel; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.data.DesignTableDataManager; @@ -71,7 +71,7 @@ public final class StoreProcedureNameWrapper implements TableDataWrapper { @Override public Icon getIcon() { - return IconUtils.readIcon("/com/fr/design/standard/store_procedure"); + return new LazyIcon("store_procedure"); } private void createStore(boolean needLoadingBar) { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java index c36084a56d..c5d8731407 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java @@ -1,5 +1,6 @@ package com.fr.design.data.tabledata.wrapper; +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; import com.fr.data.TableDataSource; import com.fr.data.impl.ClassTableData; @@ -33,6 +34,7 @@ import com.fr.workspace.server.repository.connection.ConnectionRepository; import com.fr.workspace.server.repository.tabledata.TableDataBeanHelper; import com.fr.workspace.server.repository.tabledata.TableDataRepository; +import javax.swing.Icon; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.HashMap; @@ -62,14 +64,14 @@ public abstract class TableDataFactory { * 同一类型的只能加一次,就加最上层的类,因为要排序。如果将所有的 FileTableData都加进来，那么FileTableData的排序就不正确了 */ static { - defaultMap.put(DBTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database_normal.svg", DBTableData.class, DBTableDataPane.class)); - defaultMap.put(ClassTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class, ClassTableDataPane.class)); - defaultMap.put(EmbeddedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class)); - defaultMap.put(DecoratedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi_normal.svg", DecoratedTableData.class, DecoratedTableDataPane.class)); - defaultMap.put(StoreProcedure.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/store_procedure_normal.svg", StoreProcedure.class, ProcedureDataPane.class)); - defaultMap.put(MultiTDTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi_normal.svg", MultiTDTableData.class, MultiTDTableDataPane.class)); - defaultMap.put(FileTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/file_normal.svg", FileTableData.class, FileTableDataPane.class)); - defaultMap.put(RecursionTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/tree_normal.svg", RecursionTableData.class, TreeTableDataPane.class)); + defaultMap.put(DBTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("database"), DBTableData.class, DBTableDataPane.class)); + defaultMap.put(ClassTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("class_table_data"), ClassTableData.class, ClassTableDataPane.class)); + defaultMap.put(EmbeddedTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("data_table"), EmbeddedTableData.class, EmbeddedTableDataPane.class)); + defaultMap.put(DecoratedTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("multi"), DecoratedTableData.class, DecoratedTableDataPane.class)); + defaultMap.put(StoreProcedure.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("store_procedure"), StoreProcedure.class, ProcedureDataPane.class)); + defaultMap.put(MultiTDTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("multi"), MultiTDTableData.class, MultiTDTableDataPane.class)); + defaultMap.put(FileTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("file"), FileTableData.class, FileTableDataPane.class)); + defaultMap.put(RecursionTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("tree"), RecursionTableData.class, TreeTableDataPane.class)); /// 待实现 //defaultMap.put(MultiFieldTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database_normal.svg", MultiFieldTableData.class, null)); defaultMap.put(DCTableData.class.getName(), @@ -157,15 +159,26 @@ public abstract class TableDataFactory { /** * 获取数据集所对应的图标路径 * - * @param tabledata - * @return + * 获取图标直接使用 {@link #getIcon(TableData)} */ + @Deprecated public static String getIconPath(TableData tabledata) { TableDataNameObjectCreator tableDataNameObjectCreator = getTableDataNameObjectCreator(tabledata); if (tableDataNameObjectCreator != null && tableDataNameObjectCreator.getIconPath() != null) { return tableDataNameObjectCreator.getIconPath(); } - return "/com/fr/design/standard/database_normal.svg"; + return "database"; + } + + /** + * 获取数据集所对应的图标 + */ + public static Icon getIcon(TableData tabledata) { + TableDataNameObjectCreator tableDataNameObjectCreator = getTableDataNameObjectCreator(tabledata); + if (tableDataNameObjectCreator != null && tableDataNameObjectCreator.menuIcon() != null) { + return tableDataNameObjectCreator.menuIcon(); + } + return new LazyIcon(getIconPath(tabledata)); } /** diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java index 93bb7bf3bf..00a2a7c87c 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java @@ -1,14 +1,12 @@ package com.fr.design.data.tabledata.wrapper; -import javax.swing.Icon; - +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; -import com.fr.base.svg.IconUtils; -import com.fr.base.svg.SVGLoader; import com.fr.data.impl.DBTableData; -import com.fr.design.icon.WarningIcon; import com.fr.stable.StringUtils; +import javax.swing.Icon; + public final class TemplateTableDataWrapper extends AbstractTableDataWrapper { public TemplateTableDataWrapper(TableData tabledata) { super(tabledata); @@ -21,9 +19,9 @@ public final class TemplateTableDataWrapper extends AbstractTableDataWrapper { @Override public Icon getIcon() { if (tabledata instanceof DBTableData && StringUtils.isBlank(((DBTableData) tabledata).getQuery())) { - return new WarningIcon(SVGLoader.load("/com/fr/design/standard/database_normal.svg")); + return new LazyIcon("database_warning"); } - return IconUtils.readIcon(TableDataFactory.getIconPath(tabledata)); + return TableDataFactory.getIcon(tabledata); } @Override diff --git a/designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java b/designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java index b7a425ccab..bb4ce2ebdf 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java @@ -1,17 +1,22 @@ package com.fr.design.dialog; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.utils.gui.GUICoreUtils; -import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.FlowLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; + /** * 封装了"为该模版单独设置、采用服务器设置"选项功能的设置面板 * Created by plough on 2018/11/7. @@ -36,16 +41,13 @@ public abstract class AbstractTemplateServerSettingPane extends BasicPane { private void initComponents() { chooseComboBox = new UIComboBox(CHOOSEITEM); chooseComboBox.addItemListener(itemListener); + chooseComboBox.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + //以下设置，部分面板通用 UILabel belowSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set")); - belowSetLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20)); - buttonPane = GUICoreUtils.createFlowPane(new Component[] { - belowSetLabel, chooseComboBox}, FlowLayout.LEFT, 0, 0); - buttonPane.setBorder(BorderFactory.createEmptyBorder(10, 20, 0, 0)); - + buttonPane = row(32, cell(belowSetLabel), cell(chooseComboBox), flex()).getComponent(); this.setLayout(new BorderLayout()); - this.add(buttonPane, BorderLayout.NORTH); this.contentPane = getContentPane(); - this.add(contentPane, BorderLayout.CENTER); + this.add(column(cell(buttonPane), cell(contentPane).weight(1)).getComponent()); } /** diff --git a/designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java b/designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java index 3b3b1d620f..8eb0594415 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java @@ -1,8 +1,11 @@ package com.fr.design.dialog; +import com.fine.theme.utils.FineUIScale; import com.fr.common.annotations.Open; -import java.awt.*; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Frame; @Open public abstract class BasicDialog extends UIDialog { @@ -12,7 +15,7 @@ public abstract class BasicDialog extends UIDialog { public static final Dimension LARGE = new Dimension(900, 600); public static final Dimension CHART = new Dimension(760, 560); public static final Dimension MAP_SIZE = new Dimension(760, 450); - public static final Dimension UPDATE_ONLINE_SIZE = new Dimension(600,300); + public static final Dimension UPDATE_ONLINE_SIZE = new Dimension(600, 300); public static final Dimension TOOLBAR_SIZE = new Dimension(660, 327); public BasicDialog(Frame parent) { @@ -40,12 +43,23 @@ public abstract class BasicDialog extends UIDialog { super(parent, pane, isNeedButtonPane); } + /** + * 设置对话框大小，方法内已进行dpi适配，传参无需考虑dpi适配 + * + * @param d 对话框尺寸 + */ protected void setBasicDialogSize(Dimension d) { - super.setSize(d.width, d.height); + super.setSize(FineUIScale.scale(d.width), FineUIScale.scale(d.height)); } + /** + * 设置对话框大小，方法内已进行dpi适配，传参无需考虑dpi适配 + * + * @param w 宽度 + * @param h 高度 + */ protected void setBasicDialogSize(int w, int h) { - super.setSize(w, h); + setBasicDialogSize(new Dimension(w, h)); } @Override diff --git a/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java b/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java index ac125c6a16..cfd0ccd70a 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java +++ b/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java @@ -1,6 +1,11 @@ package com.fr.design.dialog; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.common.annotations.Open; +import com.fr.design.constants.LayoutConstants; +import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.DesignSizeI18nManager; @@ -9,14 +14,17 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.core.PropertyChangeAdapter; import javax.swing.JPanel; +import javax.swing.SwingUtilities; import javax.swing.event.DocumentEvent; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Dialog; import java.awt.Dimension; import java.awt.Frame; import java.awt.Window; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + @Open public abstract class BasicPane extends JPanel { @@ -144,9 +152,9 @@ public abstract class BasicPane extends JPanel { /** * 以自定义的宽高显示窗口 * - * @param window 窗口 - * @param l 对话框监听器 - * @param dimension 自定义尺寸 + * @param window 窗口 + * @param l 对话框监听器 + * @param dimension 自定义尺寸，已适配缩放 * @return 对话框 */ public BasicDialog showWindowWithCustomSize(Window window, DialogActionListener l, @@ -171,12 +179,17 @@ public abstract class BasicPane extends JPanel { dg = new DIALOG((Dialog) window, isNeedButtonPane); } - if (l != null) { - dg.addDialogActionListener(l); - } - dg.setBasicDialogSize(dimension); - GUICoreUtils.centerWindow(dg); - dg.setResizable(false); + SwingUtilities.invokeLater(() -> { + if (l != null) { + dg.addDialogActionListener(l); + } + dg.setBasicDialogSize(dimension); + GUICoreUtils.centerWindow(dg); + dg.setResizable(false); + dg.setVisible(true); + dg.toFront(); + dg.requestFocus(); + }); return dg; } @@ -315,16 +328,24 @@ public abstract class BasicPane extends JPanel { private PropertyChangeAdapter changeListener; public NamePane(BasicPane bPane) { - this.setLayout(new BorderLayout(4, 4)); - - nameTextField = new UITextField(30); - Name = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Name") + ":"); - JPanel northPane = new JPanel(new BorderLayout(4, 4)); - northPane.add(Name, BorderLayout.WEST); - northPane.add(nameTextField, BorderLayout.CENTER); - northPane.add(showfield = new UILabel(" "), BorderLayout.EAST); - showfield.setForeground(new Color(204, 0, 1)); - showfield.setPreferredSize(new Dimension(220, showfield.getPreferredSize().height)); + double titleRatio = 0.12; + // 树数据集标题较长，权重设置为0.2保证列对齐 + if(bPane instanceof TreeTableDataPane){ + titleRatio = 0.2; + } + this.setLayout(new BorderLayout()); + nameTextField = new UITextField(); + Name = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Name")); + JPanel northPane = new JPanel(new BorderLayout()); + northPane.setBorder(new ScaledEmptyBorder(0,0,10,0)); + northPane.add(row( + LayoutConstants.HGAP_LARGE, + cell(Name).weight(titleRatio), + cell(nameTextField).weight(0.7 - titleRatio), + cell(showfield = new UILabel(" ")).weight(0.3) + ).getComponent()); + FineUIStyle.setStyle(showfield, FineUIStyle.LABEL_WARNING_TIP); + showfield.setPreferredSize(new Dimension(FineUIScale.scale(220), showfield.getPreferredSize().height)); this.add(northPane, BorderLayout.NORTH); this.centerPane = bPane; this.add(bPane, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java b/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java index 0255748979..5c80e2b167 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java +++ b/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java @@ -3,8 +3,14 @@ package com.fr.design.dialog; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.iscrollbar.UIScrollBar; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.JScrollBar; +import java.awt.AWTEvent; +import java.awt.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.LayoutManager; import java.awt.event.AdjustmentEvent; import java.awt.event.AdjustmentListener; import java.awt.event.MouseWheelEvent; @@ -34,17 +40,6 @@ public abstract class BasicScrollPane extends BasicBeanPane{ scrollBar = new UIScrollBar(JScrollBar.VERTICAL) { private static final long serialVersionUID = 155777947121777223L; - @Override - public int getVisibleAmount() { - int preferheight = leftcontentPane.getPreferredSize().height; - if(preferheight <= 0) { - return 0; - } - int e = MAXVALUE * (getHeight() - 1) / preferheight; - setVisibleAmount(e); - return e; - } - @Override public int getMaximum() { return MAXVALUE; @@ -104,7 +99,6 @@ public abstract class BasicScrollPane extends BasicBeanPane{ protected void layoutContentPane() { leftcontentPane = createContentPane(); - leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 10, 0, 5, original)); this.add(leftcontentPane); } @@ -172,11 +166,11 @@ public abstract class BasicScrollPane extends BasicBeanPane{ int width = parent.getWidth(); int height = parent.getHeight(); if (leftcontentPane.getPreferredSize().height > maxheight && scrollBar.isVisible()) { - leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth() + getOverWidth() - DET_WIDTH_OVER_HEIGHT, height + beginY); + leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth(), height + beginY); scrollBar.setBounds(width - scrollBar.getWidth() - 1, 0, scrollBar.getWidth(), height); } else { int hideBarWidth = hideBarWidth() ? scrollBar.getWidth() : 0; - leftcontentPane.setBounds(0, 0, width - DET_WIDTH + hideBarWidth, height); + leftcontentPane.setBounds(0, 0, width + hideBarWidth, height); } } @@ -205,7 +199,6 @@ public abstract class BasicScrollPane extends BasicBeanPane{ this.setLayout(new BarLayout()); this.add(scrollBar); leftcontentPane = pane; - leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 10, 0, 5, original)); this.add(leftcontentPane); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/dialog/MultiTabPane.java b/designer-base/src/main/java/com/fr/design/dialog/MultiTabPane.java index 15fa17dd22..10dfe66007 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/MultiTabPane.java +++ b/designer-base/src/main/java/com/fr/design/dialog/MultiTabPane.java @@ -81,7 +81,7 @@ public abstract class MultiTabPane extends FurtherBasicBeanPane{ } protected void initLayout() { - this.setLayout(new BorderLayout(0, 4)); + this.setLayout(new BorderLayout()); this.add(tabPane, BorderLayout.NORTH); this.add(centerPane, BorderLayout.CENTER); } diff --git a/designer-base/src/main/java/com/fr/design/dialog/NotificationDialog.java b/designer-base/src/main/java/com/fr/design/dialog/NotificationDialog.java index 9b1d985087..96a3201c52 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/NotificationDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/NotificationDialog.java @@ -2,9 +2,11 @@ package com.fr.design.dialog; import com.fanruan.ComponentUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.concurrent.NamedThreadFactory; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; @@ -42,7 +44,7 @@ public class NotificationDialog extends JDialog { private UILabel messageText; private NotificationDialogAction notificationDialogAction; private ScheduledExecutorService TIMER; - private Dimension dialogSize = new Dimension(230, 95); + private Dimension dialogSize = FineUIScale.scale(new Dimension(230, 95)); public NotificationDialog(Frame owner, String title, boolean isModal, int messageType, String message, NotificationDialogAction action) { this(owner, title, isModal, messageType, message, action, null); @@ -71,19 +73,19 @@ public class NotificationDialog extends JDialog { setAutoRequestFocus(false); setResizable(false); JPanel body = FRGUIPaneFactory.createBorderLayout_L_Pane(); - body.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + body.setBorder(new ScaledEmptyBorder(0, 0, 0, 0)); //消息内容 UILabel icon = new UILabel(getIconForType(messageType)); JPanel iconPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - iconPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 8)); + iconPanel.setBorder(new ScaledEmptyBorder(0, 10, 10, 10)); iconPanel.add(icon); body.add(iconPanel, BorderLayout.WEST); messageText = new UILabel(HTML_TAG_1 + message + HTML_TAG_2); messageText.setForeground(new Color(51, 51, 52)); JPanel centerPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - centerPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 5, 20)); + centerPanel.setBorder(new ScaledEmptyBorder(10, 0, 10, 10)); JScrollPane jScrollPane = new JScrollPane(messageText, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); jScrollPane.setBorder(BorderFactory.createEmptyBorder()); centerPanel.add(jScrollPane, BorderLayout.CENTER); @@ -161,21 +163,21 @@ public class NotificationDialog extends JDialog { } protected Icon getIconForType(int messageType) { - String propertyName; + String id; switch (messageType) { case 0: - propertyName = "OptionPane.circularErrorIcon"; + id = "error"; break; case 1: - propertyName = "OptionPane.newMessageIcon"; + id = "new_information"; break; case 2: - propertyName = "OptionPane.circularWarningIcon"; + id = "warning"; break; default: return null; } - return UIManager.getIcon(propertyName); + return new LazyIcon(id, 20); } public static Builder Builder() { diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java index 63aea87c3c..3a5aef5487 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java @@ -1,5 +1,9 @@ package com.fr.design.dialog; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; @@ -30,6 +34,7 @@ import java.util.ArrayList; public abstract class UIDialog extends JDialog { public static final String OK_BUTTON = "basic_ok"; public static final String CANCEL_BUTTON = "basic_cancel"; + private static final int HORIZONTAL_GAP = 8; private UIButton okButton, cancelButton; private BasicPane pane; private java.util.List listeners = new ArrayList(); @@ -77,8 +82,8 @@ public abstract class UIDialog extends JDialog { private void initComponents(boolean isNeedButtonPane) { JPanel contentPane = (JPanel) this.getContentPane(); - contentPane.setBorder(BorderFactory.createEmptyBorder(2, 4, 4, 4)); - contentPane.setLayout(new BorderLayout(0, 4)); + contentPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); + contentPane.setLayout(new BorderLayout(0, 10)); this.applyClosingAction(); this.applyEscapeAction(); contentPane.add(pane, BorderLayout.CENTER); @@ -94,7 +99,7 @@ public abstract class UIDialog extends JDialog { private JPanel createControlButtonPane() { JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0)); + JPanel buttonsPane = Layouts.row(HORIZONTAL_GAP).getComponent(); controlPane.add(buttonsPane, BorderLayout.EAST); //增加一个自定义按钮, 可以用于eg: 设为全局配置 @@ -148,6 +153,7 @@ public abstract class UIDialog extends JDialog { okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); okButton.setName(OK_BUTTON); okButton.setMnemonic('O'); + FineUIStyle.setStyle(okButton, FineUIStyle.STYLE_PRIMARY); buttonsPane.add(okButton); okButton.addActionListener(new ActionListener() { diff --git a/designer-base/src/main/java/com/fr/design/dialog/mobile/MobileRadioCheckPane.java b/designer-base/src/main/java/com/fr/design/dialog/mobile/MobileRadioCheckPane.java index 0b66019c91..7750cb01b9 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/mobile/MobileRadioCheckPane.java +++ b/designer-base/src/main/java/com/fr/design/dialog/mobile/MobileRadioCheckPane.java @@ -6,8 +6,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; -import javax.swing.JPanel; +import java.awt.BorderLayout; import java.awt.Component; import java.util.ArrayList; import java.util.List; @@ -30,16 +29,12 @@ public class MobileRadioCheckPane extends BasicBeanPane { UICheckBox checkBox = new UICheckBox(title); checkBox.setSelected(false); - checkBoxes.add(checkBox); - Component[][] components = new Component[][]{ new Component[]{checkBox} }; - JPanel fitOpsPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - fitOpsPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0)); - - this.add(fitOpsPane); + this.setLayout(new BorderLayout()); + this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize)); } public int getCurrentState() { diff --git a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java index 800e1596bd..632d914afd 100644 --- a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java @@ -1,7 +1,9 @@ package com.fr.design.editor; +import com.fine.swing.ui.layout.Layouts; import com.fr.base.BaseFormula; import com.fr.design.DesignerEnvManager; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.editor.editor.ColumnIndexEditor; @@ -25,12 +27,12 @@ import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; + /** * Created by MoMeak on 2017/7/26. */ @@ -45,7 +47,6 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, private UIButton arrowButton; private JPopupMenu menu; private JPanel centerPane; - private CardLayout cardLayout; private Object value; private UIButtonGroup upButton; private GlobalNameListener globalNameListener = null; @@ -76,42 +77,38 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, private void initComponents(final Editor[] cards, String popupName, String textEditorValue, int centerPaneWidth) { - this.setLayout(new BorderLayout(0, 4)); + this.setLayout(new BorderLayout()); this.cards = cards; final String[] nameArray = new String[cards.length]; for (int i = 0; i < cards.length; i++) { nameArray[i] = cards[i].getName(); } - upButton = new UIButtonGroup(nameArray); + upButton = new UIButtonGroup<>(nameArray); upButton.setAllToolTips(nameArray); - this.add(upButton, BorderLayout.NORTH); - centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - setCurrentEditor(0); - centerPane.setPreferredSize(new Dimension(centerPaneWidth, centerPane.getPreferredSize().height)); menu = createPopMenu(); - upButton.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - if (globalNameListener != null) { - globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Policy")); - } - Object oldValue = currentEditor.getValue(); - setCurrentEditor(upButton.getSelectedIndex()); - currentEditor.selected(); - value = currentEditor.getValue(); - if (uiObserverListener != null) { - uiObserverListener.doChange(); - } - - DoubleDeckValueEditorPane.this.firePropertyChange("value", oldValue, value); + upButton.addChangeListener(e -> { + if (globalNameListener != null) { + globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Policy")); } + Object oldValue = currentEditor.getValue(); + setCurrentEditor(upButton.getSelectedIndex()); + currentEditor.selected(); + value = currentEditor.getValue(); + if (uiObserverListener != null) { + uiObserverListener.doChange(); + } + + DoubleDeckValueEditorPane.this.firePropertyChange("value", oldValue, value); }); - this.add(centerPane, BorderLayout.CENTER); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(upButton), + cell(centerPane) + ).getComponent(), BorderLayout.CENTER); } diff --git a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java index b19e243850..5822570e1a 100644 --- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java @@ -1,5 +1,6 @@ package com.fr.design.editor; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseFormula; import com.fr.design.DesignerEnvManager; import com.fr.design.dialog.BasicPane; @@ -22,8 +23,16 @@ import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Color; +import java.awt.Rectangle; +import java.awt.BorderLayout; +import java.awt.Container; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -61,13 +70,13 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName this.cards = cards; // Frank：布局 - this.setLayout(new BorderLayout(2, 0)); + this.setLayout(new BorderLayout()); centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); arrowButton = new UIButton(); arrowButton.set4ToolbarButton(); setCurrentEditor(0); - centerPane.setPreferredSize(new Dimension(centerPaneWidth, centerPane.getPreferredSize().height)); - arrowButton.setPreferredSize(new Dimension(20, centerPane.getPreferredSize().height)); + centerPane.setPreferredSize(new Dimension(FineUIScale.scale(centerPaneWidth), centerPane.getPreferredSize().height)); + arrowButton.setPreferredSize(new Dimension(FineUIScale.scale(24), centerPane.getPreferredSize().height)); final Color beforeColor = arrowButton.getBackground(); menu = createPopMenu(); @@ -129,6 +138,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName if (this.cards.length == 1) { this.remove(arrowButton); } + } public void setCurrentEditor(Class editorClass) { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java index af2589d455..1ce1b369a6 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java @@ -7,8 +7,8 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; -import javax.swing.*; -import java.awt.*; +import javax.swing.JComponent; +import java.awt.BorderLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -106,6 +106,11 @@ public class BooleanEditor extends Editor { return "type_bool"; } + @Override + public String getIconId() { + return "type_boolean_popup"; + } + @Override public boolean accept(Object object) { return object instanceof Boolean; diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java index e3b5dacccd..ebd16e5d60 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java @@ -3,7 +3,7 @@ package com.fr.design.editor.editor; import com.fr.design.gui.icombobox.IntComboBox; -import java.awt.*; +import java.awt.BorderLayout; import java.awt.event.ActionListener; import java.awt.event.ItemListener; @@ -41,8 +41,6 @@ public class ColumnIndexEditor extends Editor { } this.add(valueColumnIndexComboBox, BorderLayout.CENTER); this.setName(name); - valueColumnIndexComboBox.setBorder(null); - } @Override @@ -59,6 +57,11 @@ public class ColumnIndexEditor extends Editor { return "ds_column_index"; } + @Override + public String getIconId(){ + return "dsColumnIndex_popup"; + } + /** * object参数是否是Integer * diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java index f4d2a132cf..06dcca4ae5 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java @@ -5,8 +5,8 @@ import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JList; +import java.awt.Component; /** * 列编辑器，里面是列名 @@ -76,4 +76,9 @@ public class ColumnNameEditor extends ColumnIndexEditor { return "ds_column_name"; } + @Override + public String getIconId() { + return "dsColumnName_popup"; + } + } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnRowEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnRowEditor.java index 2da3bc3108..baa55e6b40 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnRowEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnRowEditor.java @@ -68,6 +68,11 @@ public class ColumnRowEditor extends Editor { return "cell"; } + @Override + public String getIconId() { + return "cellelement_popup"; + } + @Override public boolean accept(Object object) { return object instanceof ColumnRow; diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java index 5260ce1752..e6ffbadd66 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java @@ -6,17 +6,19 @@ import com.fr.design.data.datapane.TableDataComboBox; import com.fr.design.data.tabledata.Prepare4DataSourceChange; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.data.TableDataColumn; import com.fr.stable.StringUtils; -import java.awt.*; +import java.awt.BorderLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.List; import java.util.regex.Pattern; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 选择数据列编辑器 * @@ -30,7 +32,7 @@ public class ColumnSelectedEditor extends Editor implements Prep public ColumnSelectedEditor() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Column")); - this.setLayout(FRGUIPaneFactory.createLeftZeroLayout()); + this.setLayout(new BorderLayout()); tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); columnNames = new String[0]; tableDataComboBox.addItemListener(new ItemListener() { @@ -52,10 +54,7 @@ public class ColumnSelectedEditor extends Editor implements Prep } }); columnNameComboBox = new UIComboBox(); - tableDataComboBox.setPreferredSize(new Dimension(82, 20)); - this.add(tableDataComboBox); - columnNameComboBox.setPreferredSize(new Dimension(82, 20)); - this.add(columnNameComboBox); + this.add(row(10, cell(tableDataComboBox), cell(columnNameComboBox)).getComponent()); } @Override @@ -88,6 +87,11 @@ public class ColumnSelectedEditor extends Editor implements Prep return "ds_column"; } + @Override + public String getIconId() { + return "bind_column_popup"; + } + @Override public boolean accept(Object object) { return object instanceof SimpleDSColumn; diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java index 3b658d0cef..d8997a5556 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java @@ -14,7 +14,6 @@ public class CursorEditor extends Editor { this.setLayout(FRGUIPaneFactory.createCenterFlowLayout()); label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor")); this.add(label); - this.setPreferredSize(new Dimension(10,20)); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor")); this.setEnabled(false); } diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/DateEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/DateEditor.java index c40161ba6c..00e75b9e51 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/DateEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/DateEditor.java @@ -168,6 +168,11 @@ public class DateEditor extends Editor { public String getIconName() { return "type_date"; } + + @Override + public String getIconId() { + return "date_popup"; + } public void setUIDatePickerStyle(int style){ this.uiDatePicker.setStyle(style); diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/Editor.java b/designer-base/src/main/java/com/fr/design/editor/editor/Editor.java index d80e3d730e..2119d78b44 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/Editor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/Editor.java @@ -3,10 +3,12 @@ */ package com.fr.design.editor.editor; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.Icon; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -35,15 +37,21 @@ public abstract class Editor extends JComponent { // 约定图片的文件名为this.getName(),处理起来方便些 // b:这里国际化没有考虑 public Icon getIcon() { - if (StringUtils.isEmpty(this.getIconName())) { - return null; - } - String iconName = "com/fr/design/images/buttonicon/" + this.getIconName() + ".png"; - try { - return BaseUtils.readIcon(iconName); - } catch (NullPointerException e) { - return null; + if(null == this.getIconId()){ + if (StringUtils.isEmpty(this.getIconName())) { + return null; + } + try { + return BaseUtils.readIcon("com/fr/design/images/buttonicon/" + this.getIconName() + ".png"); + } catch (NullPointerException e) { + return null; + } } + return new LazyIcon(this.getIconId()); + } + + public String getIconId(){ + return StringUtils.EMPTY; } public String getName() { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java index b8dc5ad8fe..860534cb5c 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java @@ -10,9 +10,10 @@ import com.fr.design.formula.UIFormula; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import javax.swing.*; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; import javax.swing.event.DocumentListener; -import java.awt.*; +import java.awt.BorderLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -139,6 +140,11 @@ public class FormulaEditor extends Editor { return "type_formula"; } + @Override + public String getIconId() { + return "formula_popup"; + } + /** * object是否是公司类型对象 * diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java index b68c62b6d3..db72713eb7 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java @@ -35,6 +35,11 @@ public class IntegerEditor extends NumberEditor { return "type_int"; } + @Override + public String getIconId(){ + return "dsColumnIndex_popup"; + } + @Override public void setValue(Integer value) { if (value == null) { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/NumberEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/NumberEditor.java index 26b81f8a4b..0e20c1e569 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/NumberEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/NumberEditor.java @@ -8,7 +8,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.stable.StringUtils; -import java.awt.*; +import java.awt.BorderLayout; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; @@ -41,7 +41,6 @@ public abstract class NumberEditor extends Editor { numberField = createNumberField(); this.add(numberField, BorderLayout.CENTER); this.numberField.addKeyListener(textKeyListener); - this.numberField.setHorizontalAlignment(UITextField.RIGHT); this.setValue(value); this.setName(name); } @@ -110,6 +109,11 @@ public abstract class NumberEditor extends Editor { return "type_double"; } + @Override + public String getIconId(){ + return "type_double_popup"; + } + /** * Request focus */ diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java index b2cb6dc211..31a194d4c2 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java @@ -8,8 +8,11 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; +import java.awt.BorderLayout; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemListener; @@ -102,6 +105,11 @@ public class OldColumnIndexEditor extends Editor { return "ds_column"; } + @Override + public String getIconId() { + return "bind_column_popup"; + } + @Override public boolean accept(Object object) { return object instanceof Integer || object instanceof String; diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java index be25cab036..cc02ceea50 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java @@ -4,8 +4,7 @@ import com.fr.base.Parameter; import com.fr.design.gui.icombobox.ParameterComboBox; import com.fr.design.layout.FRGUIPaneFactory; - -import java.awt.*; +import java.awt.BorderLayout; /** * 参数Editor @@ -57,6 +56,11 @@ public class ParameterEditor extends Editor { return "parameter"; } + @Override + public String getIconId() { + return "param_popup"; + } + @Override public boolean accept(Object object) { return object instanceof Parameter; diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java index 8d2bdb48ba..03ba990b42 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java @@ -6,7 +6,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.stable.StringUtils; -import java.awt.*; +import java.awt.BorderLayout; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; @@ -47,6 +47,11 @@ public class SpinnerIntegerEditor extends Editor { return "type_int"; } + @Override + public String getIconId(){ + return "dsColumnIndex_popup"; + } + KeyListener textKeyListener = new KeyAdapter() { public void keyReleased(KeyEvent evt) { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java index 7084fbcc45..e3d0300bd9 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java @@ -5,7 +5,6 @@ package com.fr.design.editor.editor; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; - import com.fr.stable.StringUtils; import java.awt.BorderLayout; @@ -40,7 +39,6 @@ public class TextEditor extends Editor { public TextEditor(String value) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); textField = new UITextField(); - textField.setBorder(null); this.add(textField, BorderLayout.CENTER); this.textField.addKeyListener(textKeyListener); @@ -149,6 +147,11 @@ public class TextEditor extends Editor { return "type_string"; } + @Override + public String getIconId() { + return "dsColumnName_popup"; + } + /** * 判断object是否是字符类型 * diff --git a/designer-base/src/main/java/com/fr/design/event/HoverAware.java b/designer-base/src/main/java/com/fr/design/event/HoverAware.java new file mode 100644 index 0000000000..36af8275db --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/event/HoverAware.java @@ -0,0 +1,13 @@ +package com.fr.design.event; + +/** + * 组件判断是否被hover的能力接口 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/07 + */ +public interface HoverAware { + + boolean isHovered(); +} diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java index 434be685db..c9c8190a98 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java @@ -7,6 +7,7 @@ import com.fr.design.extra.PluginOperateUtils; import com.fr.design.i18n.Toolkit; import com.fr.design.plugin.DesignerPluginContext; +import com.fr.design.ui.util.UIUtil; import com.fr.log.FineLoggerFactory; import com.fr.plugin.manage.control.PluginTaskCallback; import com.fr.plugin.manage.control.PluginTaskResult; @@ -32,17 +33,19 @@ public class ModifyStatusCallback implements PluginTaskCallback { @Override public void done(PluginTaskResult result) { - String pluginInfo = PluginOperateUtils.getSuccessInfo(result); - if (result.isSuccess()) { - jsCallback.execute("success"); - String modifyMessage = isActive ? - pluginInfo + Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate") : - pluginInfo + Toolkit.i18nText("Fine-Design_Plugin_Has_Been_Actived_Duplicate"); - FineLoggerFactory.getLogger().info(modifyMessage); - FineJOptionPane.showMessageDialog(DesignerPluginContext.getPluginDialog(), modifyMessage); - } else { - FineJOptionPane.showMessageDialog(DesignerPluginContext.getPluginDialog(), pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE); - } + UIUtil.invokeLaterIfNeeded(() -> { + String pluginInfo = PluginOperateUtils.getSuccessInfo(result); + if (result.isSuccess()) { + jsCallback.execute("success"); + String modifyMessage = isActive ? + pluginInfo + Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate") : + pluginInfo + Toolkit.i18nText("Fine-Design_Plugin_Has_Been_Actived_Duplicate"); + FineLoggerFactory.getLogger().info(modifyMessage); + FineJOptionPane.showMessageDialog(DesignerPluginContext.getPluginDialog(), modifyMessage); + } else { + FineJOptionPane.showMessageDialog(DesignerPluginContext.getPluginDialog(), pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + } + }); } } diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java index 6fba685d75..5baeeaeff4 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java @@ -5,6 +5,7 @@ import com.fr.design.dialog.FineJOptionPane; import com.fr.design.extra.PluginOperateUtils; import com.fr.design.i18n.Toolkit; +import com.fr.design.ui.util.UIUtil; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.error.PluginErrorCode; @@ -17,34 +18,36 @@ import com.fr.plugin.manage.control.PluginTaskResult; public class UninstallPluginCallback extends AbstractPluginTaskCallback { private JSCallback jsCallback; - public UninstallPluginCallback(PluginMarker pluginMarker, JSCallback jsCallback){ + public UninstallPluginCallback(PluginMarker pluginMarker, JSCallback jsCallback) { this.jsCallback = jsCallback; this.pluginMarker = pluginMarker; } @Override public void done(PluginTaskResult result) { - String pluginInfo = PluginOperateUtils.getSuccessInfo(result); - if (result.isSuccess()) { - jsCallback.execute("success"); - String successInfo = pluginInfo + Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success"); - FineLoggerFactory.getLogger().info(successInfo); - FineJOptionPane.showMessageDialog(null, successInfo); - }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) { - int rv = FineJOptionPane.showConfirmDialog( - null, - Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"), - Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), - FineJOptionPane.OK_CANCEL_OPTION, - FineJOptionPane.INFORMATION_MESSAGE - ); - if (rv == FineJOptionPane.OK_OPTION) { - PluginManager.getController().uninstall(pluginMarker, true, new UninstallPluginCallback(pluginMarker, jsCallback)); + UIUtil.invokeLaterIfNeeded(() -> { + String pluginInfo = PluginOperateUtils.getSuccessInfo(result); + if (result.isSuccess()) { + jsCallback.execute("success"); + String successInfo = pluginInfo + Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success"); + FineLoggerFactory.getLogger().info(successInfo); + FineJOptionPane.showMessageDialog(null, successInfo); + } else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) { + int rv = FineJOptionPane.showConfirmDialog( + null, + Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"), + Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), + FineJOptionPane.OK_CANCEL_OPTION, + FineJOptionPane.INFORMATION_MESSAGE + ); + if (rv == FineJOptionPane.OK_OPTION) { + PluginManager.getController().uninstall(pluginMarker, true, new UninstallPluginCallback(pluginMarker, jsCallback)); + } + } else { + jsCallback.execute("failed"); + FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed")); + FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), FineJOptionPane.ERROR_MESSAGE); } - } else { - jsCallback.execute("failed"); - FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed")); - FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), FineJOptionPane.ERROR_MESSAGE); - } + }); } } diff --git a/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java b/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java index 1d2048fa28..728b915163 100644 --- a/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java +++ b/designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java @@ -1,5 +1,9 @@ package com.fr.design.file; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.actions.UpdateAction; import com.fr.design.actions.file.DelFileAction; import com.fr.design.actions.file.LocateAction; @@ -37,7 +41,6 @@ import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; @@ -45,6 +48,9 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; import static javax.swing.JOptionPane.WARNING_MESSAGE; import static javax.swing.JOptionPane.YES_NO_OPTION; @@ -147,7 +153,7 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi public CopyAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Copy")); this.setMnemonic('C'); - this.setSmallIcon("/com/fr/design/images/m_edit/copy"); + this.setSmallIcon(new LazyIcon("monochrome_copy")); } @Override @@ -190,7 +196,7 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi public PasteAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Action_Paste_Name")); this.setMnemonic('P'); - this.setSmallIcon("/com/fr/design/images/m_edit/paste"); + this.setSmallIcon(new LazyIcon("monochrome_paste")); } @Override @@ -315,7 +321,7 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi public MoveAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Move")); - this.setSmallIcon("/com/fr/design/images/m_edit/move"); + this.setSmallIcon(new LazyIcon("move")); } @Override @@ -369,12 +375,12 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi dirTreePane = TemplateDirTreePane.getInstance(); card.show(cardPane, DIR); add(cardPane, BorderLayout.CENTER); - cardPane.setBorder(BorderFactory.createEmptyBorder(10, 15, 0, 10)); + cardPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); dirTreePane.refresh(); // 确认按钮，默认就可用 confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Confirm")); - confirmButton.setPreferredSize(new Dimension(60, 25)); + FineUIStyle.setStyle(confirmButton, FineUIStyle.STYLE_PRIMARY); confirmButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -385,7 +391,6 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi // 取消按钮 UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); - cancelButton.setPreferredSize(new Dimension(60, 25)); cancelButton.addActionListener(new ActionListener() { @@ -395,13 +400,10 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi } }); - JPanel bottomPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT, 10, 0)); - bottomPanel.setBorder(BorderFactory.createEmptyBorder(10, 15, 10, 10)); - bottomPanel.add(confirmButton); - bottomPanel.add(cancelButton); - this.add(bottomPanel, BorderLayout.SOUTH); + this.add(row(8, flex(), cell(confirmButton), cell(cancelButton)) + .with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, 10, 10))).getComponent(), BorderLayout.SOUTH); - this.setSize(new Dimension(600, 400)); + this.setSize(FineUIScale.scale(new Dimension(660, 600))); this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Move")); this.setResizable(false); this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); @@ -421,7 +423,9 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi dialog.setVisible(true); DesignerFrameFileDealerPane.getInstance().getSelectedOperation().refresh(); - LocateAction.gotoEditingTemplateLeaf(targetFile); + SwingUtilities.invokeLater(() -> { + LocateAction.gotoEditingTemplateLeaf(targetFile); + }); } } diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java index f895a4f5b4..ab5c485cc8 100644 --- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java +++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java @@ -298,9 +298,7 @@ public class HistoryTemplateListCache implements CallbackEvent { int index = iterator.nextIndex(); if (size == index + 1 && index > 0) { //如果删除的是后一个Tab，则定位到前一个 - MultiTemplateTabPane.getInstance().setSelectedIndex( - MultiTemplateTabPane.getInstance().calNextShowJTemplateIndex(index - 1)); - + MultiTemplateTabPane.getInstance().setSelectedIndex(index - 1); } } } diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabMenuFactory.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabMenuFactory.java index 6210f7ba68..251336b52c 100644 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabMenuFactory.java +++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabMenuFactory.java @@ -1,44 +1,25 @@ package com.fr.design.file; -import com.fr.base.svg.IconUtils; -import com.fr.design.constants.UIConstants; -import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIScrollPopUpMenu; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.JTemplate; -import com.fr.design.utils.TemplateUtils; -import com.fr.stable.StringUtils; import com.fr.stable.collections.CollectionUtils; -import javax.swing.BorderFactory; -import javax.swing.Icon; -import javax.swing.JPanel; import javax.swing.SwingConstants; -import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; import java.util.List; -import java.util.Map; + /** * 右侧下拉菜单的工厂类 + * * @author Carlson * @since 11.0 * created on 2023-04-14 **/ public class MultiTemplateTabMenuFactory { - private static final Icon CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close"); - private static final Icon MOUSE_OVER_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_mouseover.svg"); - private static final Icon MOUSE_PRESS_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_press.svg"); - - private static final int ITEM_SIZE = 25; private UIScrollPopUpMenu menu = null; @@ -50,6 +31,7 @@ public class MultiTemplateTabMenuFactory { /** * 返回右侧下拉菜单的工厂类 + * * @return */ public static MultiTemplateTabMenuFactory getInstance() { @@ -61,29 +43,12 @@ public class MultiTemplateTabMenuFactory { */ public UIScrollPopUpMenu createMenu() { menu = new UIScrollPopUpMenu(); - menu.setBorder(BorderFactory.createEmptyBorder(-3, 3, 3, 0)); - menu.add(initCloseOther()); - menu.add(createEmptyRow()); menu.addSeparator(); - menu.add(createEmptyRow()); - menu.add(createCategory(Toolkit.i18nText("Fine-Design_Basic_Tab_Current_Category_Templates"))); - Component[] items = createCurrentCategory(); + Component[] items = createCurrentTabs(); for (Component item : items) { menu.add(item); } - items = createOtherCategory(); - if (items.length > 0) { - menu.addSeparator(); - menu.add(createEmptyRow()); - menu.add(createCategory(Toolkit.i18nText("Fine-Design_Basic_Tab_Other_Category_Templates"))); - for (Component item : items) { - menu.add(item); - } - } - Dimension dimension = menu.getPreferredSize(); - dimension.width += ITEM_SIZE; - menu.setPreferredSize(dimension); return menu; } @@ -91,80 +56,28 @@ public class MultiTemplateTabMenuFactory { * 关闭其它按钮 */ private UIMenuItem initCloseOther() { - UIMenuItem closeOther = new UIMenuItem(Toolkit.i18nText("Fine-Design_Basic_Tab_Close_Other_Templates_Of_Current_Category")); + UIMenuItem closeOther = new UIMenuItem(Toolkit.i18nText("Fine-Design_Close_Other_templates")); closeOther.setHorizontalAlignment(SwingConstants.CENTER); - Dimension dimension = closeOther.getPreferredSize(); - dimension.height = ITEM_SIZE; - closeOther.setPreferredSize(dimension); - String currentOperator = getCurrentTabOperatorType(); - closeOther.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - MultiTemplateTabPane.getInstance().closeOtherByOperatorType(currentOperator); - } - }); - if (MultiTemplateTabPane.getInstance().getOpenedJTemplatesByOperator(currentOperator).size() <= 1) { + closeOther.addActionListener(e -> MultiTemplateTabPane.getInstance().closeOther()); + if (MultiTemplateTabPane.getInstance().getOpenedJTemplates().size() <= 1) { closeOther.setEnabled(false); } return closeOther; } - /** - * 美观用 - */ - private JPanel createEmptyRow() { - return new JPanel() { - @Override - public Dimension getPreferredSize() { - Dimension d = super.getPreferredSize(); - d.height = 1; - return d; - } - }; - } - - /** - * 模板分类item - */ - private UIButton createCategory(String categoryName) { - UIButton button = new UIButton(categoryName); - button.setBorderPainted(false); - button.setExtraPainted(false); - button.setPreferredSize(new Dimension(menu.getWidth(), ITEM_SIZE)); - button.setOpaque(true); - button.setBackground(UIConstants.NORMAL_BACKGROUND); - button.setHorizontalAlignment(SwingConstants.LEFT); - button.setForeground(UIConstants.FLESH_BLUE); - return button; - } - /** * 创建 当前分类模板 item数组 */ - private Component[] createCurrentCategory() { - return createListDownItem(MultiTemplateTabPane.getInstance().getOpenedJTemplatesByOperator(getCurrentTabOperatorType())); + private Component[] createCurrentTabs() { + return createListDownItem(MultiTemplateTabPane.getInstance().getOpenedJTemplates()); } - private String getCurrentTabOperatorType(){ - JTemplate jTemplate= HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); + private String getCurrentTabOperatorType() { + JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); return jTemplate.getTemplateTabOperatorType(); } - /** - * 创建 其它分类模板 item数组 - */ - private Component[] createOtherCategory() { - String currentOperator = getCurrentTabOperatorType(); - List> openedTemplates = new ArrayList<>(); - Map>> map = MultiTemplateTabPane.getInstance().getOpenedJTemplatesByCategory(); - for (Map.Entry>> entry : map.entrySet()) { - if (!StringUtils.equals(currentOperator, entry.getKey())) { - openedTemplates.addAll(entry.getValue()); - } - } - return createListDownItem(openedTemplates); - } /** * 根据template列表创建多个item @@ -184,166 +97,8 @@ public class MultiTemplateTabMenuFactory { * 根据template对象创建item */ private Component createListDownMenuItem(JTemplate template) { - JPanel jPanel = new JPanel(); - jPanel.setPreferredSize(new Dimension(menu.getWidth(), ITEM_SIZE)); - jPanel.setLayout(new BorderLayout()); - - MenuItemButtonGroup menuItemButtonGroup = new MenuItemButtonGroup(template); - if (template == HistoryTemplateListCache.getInstance().getCurrentEditingTemplate()) { - menuItemButtonGroup.templateButton.setForeground(UIConstants.FLESH_BLUE); - } - - jPanel.add(menuItemButtonGroup.iconButton, BorderLayout.WEST); - jPanel.add(menuItemButtonGroup.templateButton, BorderLayout.CENTER); - jPanel.add(menuItemButtonGroup.closeButton, BorderLayout.EAST); - - return jPanel; + return new TemplateListMenuItem(menu, template); } - /** - * menu的item由模板图标、模板名、模板关闭按钮组成 - */ - private class MenuItemButtonGroup { - - private final UIButton iconButton; - private final UIButton templateButton; - private final UIButton closeButton; - - public MenuItemButtonGroup(JTemplate template) { - iconButton = createIconButton(template); - templateButton = createTemplateButton(template); - closeButton = createCloseButton(); - initListener(template); - } - - /** - * item[0] 模板图标按钮初始化 - */ - private UIButton createIconButton(JTemplate template) { - UIButton button = new UIButton(template.getIcon(), template.getIcon(), template.getIcon()); - button.setPreferredSize(new Dimension(ITEM_SIZE, ITEM_SIZE)); - button.setOpaque(true); - button.setBackground(UIConstants.NORMAL_BACKGROUND); - return button; - } - - /** - * item[1] 切换模板按钮初始化 - */ - private UIButton createTemplateButton(JTemplate template) { - UIButton button = new UIButton(TemplateUtils.createLockeTemplatedName(template, template.getTemplateName())); - button.setBorderPainted(false); - button.setExtraPainted(false); - button.setPreferredSize(new Dimension(menu.getWidth() - ITEM_SIZE * 2, ITEM_SIZE)); - button.setOpaque(true); - button.setBackground(UIConstants.NORMAL_BACKGROUND); - button.setHorizontalAlignment(SwingConstants.LEFT); - return button; - } - - /** - * item[2] 关闭模板图标按钮初始化 - */ - private UIButton createCloseButton() { - UIButton button = new UIButton(CLOSE, MOUSE_OVER_CLOSE, MOUSE_PRESS_CLOSE); - button.setPreferredSize(new Dimension(ITEM_SIZE, ITEM_SIZE)); - button.setOpaque(true); - button.setBackground(UIConstants.NORMAL_BACKGROUND); - button.setVisible(false); - return button; - } - - private void initListener(JTemplate template) { - initIconButtonListener(); - initTemplateButtonListener(template); - initCloseButtonListener(template); - } - - /** - * item[0] 模板图标按钮鼠标事件 - */ - private void initIconButtonListener() { - iconButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseEntered(MouseEvent e) { - fireMouseEnteredEvent(); - } - - @Override - public void mouseExited(MouseEvent e) { - fireMouseExitedEvent(); - } - }); - } - - /** - * item[1] 切换模板按钮鼠标事件 - */ - private void initTemplateButtonListener(JTemplate template) { - templateButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - menu.setVisible(false); - MultiTemplateTabPane.getInstance().switchJTemplate(template); - } - - @Override - public void mouseEntered(MouseEvent e) { - fireMouseEnteredEvent(); - } - - @Override - public void mouseExited(MouseEvent e) { - fireMouseExitedEvent(); - } - }); - } - - /** - * item[2] 关闭模板按钮鼠标事件 - */ - private void initCloseButtonListener(JTemplate template) { - closeButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - menu.setVisible(false); - MultiTemplateTabPane.getInstance().setIsCloseCurrent(template == HistoryTemplateListCache.getInstance().getCurrentEditingTemplate()); - MultiTemplateTabPane.getInstance().closeFormat(template); - MultiTemplateTabPane.getInstance().closeSpecifiedTemplate(template); - } - - @Override - public void mouseEntered(MouseEvent e) { - fireMouseEnteredEvent(); - } - - @Override - public void mouseExited(MouseEvent e) { - fireMouseExitedEvent(); - } - }); - } - - /** - * mouse移入item范围 - */ - private void fireMouseEnteredEvent() { - iconButton.setBackground(UIConstants.HOVER_BLUE); - templateButton.setBackground(UIConstants.HOVER_BLUE); - closeButton.setBackground(UIConstants.HOVER_BLUE); - closeButton.setVisible(true); - } - - /** - * mouse移出item范围 - */ - private void fireMouseExitedEvent() { - iconButton.setBackground(UIConstants.NORMAL_BACKGROUND); - templateButton.setBackground(UIConstants.NORMAL_BACKGROUND); - closeButton.setBackground(UIConstants.NORMAL_BACKGROUND); - closeButton.setVisible(false); - } - - } } diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java index 1a1ab51b2f..c063bdd26b 100644 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java @@ -1,112 +1,101 @@ package com.fr.design.file; -import com.fr.base.GraphHelper; -import com.fr.base.svg.IconUtils; +import com.fine.swing.ui.layout.Layouts; +import com.fine.swing.ui.layout.Row; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.vcs.DesignerMode; +import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.UpdateAction; import com.fr.design.actions.file.LocateAction; import com.fr.design.cache.DesignCacheManager; +import com.fr.design.actions.template.NewWorkBookToolButtonAction; import com.fr.design.constants.UIConstants; import com.fr.design.dialog.FineJOptionPane; +import com.fr.design.fun.MenuHandler; +import com.fr.design.fun.MultiTemplateTabPaneHandler; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIPopupMenu; import com.fr.design.gui.imenu.UIScrollPopUpMenu; -import com.fr.design.i18n.DesignSizeI18nManager; +import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; -import com.fr.design.mainframe.TemplateSavingChecker; import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager; -import com.fr.design.utils.DesignUtils; +import com.fr.design.menu.ShortCut; +import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.design.utils.gui.GUIPaintUtils; import com.fr.design.worker.WorkerManager; import com.fr.design.worker.save.CallbackSaveWorker; import com.fr.file.FILE; import com.fr.file.FileNodeFILE; import com.fr.general.ComparatorUtils; -import com.fr.general.IOUtils; import com.fr.log.FineLoggerFactory; -import com.fr.stable.Constants; +import com.fr.stable.collections.combination.Pair; import com.fr.third.javax.annotation.Nonnull; import com.fr.workspace.WorkContext; import com.fr.workspace.server.lock.TplOperator; -import javax.swing.BorderFactory; -import javax.swing.ButtonModel; import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JComponent; -import javax.swing.JMenu; -import javax.swing.JMenuItem; +import javax.swing.JButton; import javax.swing.JOptionPane; import javax.swing.JSeparator; -import javax.swing.MenuElement; -import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; -import javax.swing.plaf.basic.BasicMenuItemUI; import java.awt.AWTEvent; -import java.awt.AlphaComposite; -import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; -import java.awt.GradientPaint; +import java.awt.FlowLayout; import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.event.AWTEventListener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; -import java.awt.geom.Arc2D; -import java.awt.geom.GeneralPath; -import java.awt.geom.Line2D; -import java.awt.geom.Path2D; -import java.awt.geom.RoundRectangle2D; +import java.awt.event.MouseMotionAdapter; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import java.util.Set; +import static com.fine.theme.utils.FineClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON; +import static com.fine.theme.utils.FineUIScale.scale; +import static com.fine.theme.utils.FineUIStyle.BUTTON_TAB_ACTION; +import static com.formdev.flatlaf.FlatClientProperties.BUTTON_TYPE; import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog; import static javax.swing.JOptionPane.OK_CANCEL_OPTION; import static javax.swing.JOptionPane.OK_OPTION; import static javax.swing.JOptionPane.WARNING_MESSAGE; /** - * 改个名字，一个拼写 n 个错误 + * 模版Tab组件 * * @author daisy - * @version 11.0 + * @since 11.0 *

- * created by daisy on 2013/08/05 + * created on 2013/08/05 **/ -public class MultiTemplateTabPane extends JComponent { - - private static Icon LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list"); - private static Icon MOUSE_OVER_LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_pressed.svg"); - private static Icon MOUSE_PRESS_LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_pressed.svg"); - private static Icon CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close"); - private static Icon MOUSE_OVER_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_mouseover.svg"); - private static Icon MOUSE_PRESS_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_press.svg"); - private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/white_saving_close.gif")); - private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/grey_saving_close.gif")); - private static final String ELLIPSIS = "..."; - private static final int GAP = 5; - private static final int SMALLGAP = 3; - private static final int LIST_BUTTON_WIDTH = 34; - private static final int HEIGHT = 26; - private static final int LIST_DOWN_HEIGHT = 25; - private static final double CORNOR_RADIUS = 0.0; - //选了30度和60度的特殊角度的x,y作为经过的两个点的坐标 - private static final double SPECIAL_LOCATION_1 = 2.5; - private static final double SPECIAL_LOCATION_2 = 4.330127; - private static final int ICON_WIDTH = 22; +public class MultiTemplateTabPane extends Row { + private static final String UI_CLASS_ID = "TemplateTabPaneUI"; + private static final int GAP = 6; + private static final int SMALLGAP = 4; + private static final int DOUBLE_CLICK = 2; + + /** + * 尾部动作区宽度 + */ + public static final int TRAILING_WIDTH = 34; + + /** + * 前导动作区宽度 + * 最终宽度 = {@linkplain #SINGLE_BUTTON_WIDTH} * {@literal toolBar.getComponentCount()} + */ + public static int leadingWidth; + // 每个按钮固定宽度大小 + public static int SINGLE_BUTTON_WIDTH = 38; //每个标签页的最大的长度和最小长度。这些长度均为均分 @@ -123,8 +112,7 @@ public class MultiTemplateTabPane extends JComponent { private int mouseOveredIndex = -1; //tab栏可以放下的每个tab的实际宽度 - private int realWidth = MAXWIDTH; - + private int tabWidth; //当前标签页栏存放的所有标签页的index private int minPaintIndex = 0; @@ -133,21 +121,31 @@ public class MultiTemplateTabPane extends JComponent { //每个关闭图标的起始位置 private int[] startX; - private boolean[] isNeedToolTips; //记录关闭按钮的状态 private int closeIconIndex = -1; private boolean isCloseCurrent = false; - private Icon clodeMode = CLOSE; - private Icon listDownMode = LIST_DOWN; + private boolean hoverMoreAction = false; + private Icon clodeIcon = new LazyIcon("clear"); private boolean isShowList = false; + private JButton leadingActionButton; + private final UIToolbar leadingToolBar = new UIToolbar(); //自动新建的模板B若没有进行任何编辑，切换到其他 // // 模板时，模板B会自动关闭 private JTemplate temTemplate = null; + private ActionListener newTemplateAction; + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + /** + * 单例 + */ public static MultiTemplateTabPane getInstance() { if (THIS == null) { THIS = new MultiTemplateTabPane(); @@ -160,27 +158,20 @@ public class MultiTemplateTabPane extends JComponent { * 多工作簿面板 */ public MultiTemplateTabPane() { - this.setLayout(new BorderLayout(0, 0)); + this.addMouseListener(new MultiTemplateTabMouseListener()); this.addMouseMotionListener(new MultiTemplateTabMouseMotionListener()); this.setBorder(null); - this.setForeground(new Color(58, 56, 58)); - this.setFont(DesignUtils.getDefaultGUIFont().applySize(12)); openedTemplate = HistoryTemplateListCache.getInstance().getHistoryList(); selectedIndex = openedTemplate.size() - 1; - AWTEventListener awt = new AWTEventListener() { - @Override - public void eventDispatched(AWTEvent event) { - if (event instanceof MouseEvent) { - MouseEvent mv = (MouseEvent) event; - if (mv.getClickCount() > 0 && !ComparatorUtils.equals(mv.getSource(), MultiTemplateTabPane.this)) { - isShowList = false; - } + java.awt.Toolkit.getDefaultToolkit().addAWTEventListener(event -> { + if (event instanceof MouseEvent) { + MouseEvent mv = (MouseEvent) event; + if (mv.getClickCount() > 0 && !ComparatorUtils.equals(mv.getSource(), MultiTemplateTabPane.this)) { + isShowList = false; } } - - }; - java.awt.Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK); + }, AWTEvent.MOUSE_EVENT_MASK); addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent e) { @@ -188,30 +179,55 @@ public class MultiTemplateTabPane extends JComponent { int tplIndex = getTemplateIndex(e.getX()); if (tplIndex > -1) { UIPopupMenu menu = new UIPopupMenu(); - menu.setBorder(BorderFactory.createEmptyBorder(-3, 3, 3, 0)); - for (CloseOption option : CloseOption.values()) { menu.add(new UIMenuItem(new RightMenuCloseAction(option, tplIndex))); } menu.add(new CloseMenuItemJSeparator()); menu.add(new UIMenuItem(new OpenInTemplateTreeAction(tplIndex))); - - int height = 0; - for (MenuElement subElement : menu.getSubElements()) { - if (subElement instanceof CloseMenuItemJSeparator) { - height += 10; - } else { - height += 25; - } - } - //根据当前i18n语言环境，动态调整popupMenu的宽度 - menu.setPreferredSize(new Dimension((int) DesignSizeI18nManager.getInstance(). - i18nDimension("com.fr.design.file.MultiTemplateTabPane.popUpMenu").getWidth(), height)); - GUICoreUtils.showPopupMenu(menu, MultiTemplateTabPane.getInstance(), e.getX(), MultiTemplateTabPane.getInstance().getY() - 1 + MultiTemplateTabPane.getInstance().getHeight()); + GUICoreUtils.showPopupMenu(menu, + MultiTemplateTabPane.getInstance(), + e.getX(), + MultiTemplateTabPane.getInstance().getY() + MultiTemplateTabPane.getInstance().getHeight()); } } } }); + preProcessMultiTemplateTabPane(); + add( + Layouts.cell(getLeadingToolBar()).with(it -> { + it.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TOOLBAR_BUTTON); + it.setOpaque(false); + it.setBorder(new ScaledEmptyBorder(3, -7, 3, -7)); + FineUIStyle.setStyle(it, BUTTON_TAB_ACTION); + }) + ); + } + + /** + * 重置多工作簿面板 + */ + public void resetMultiTemplateTabPane() { + preProcessMultiTemplateTabPane(); + MultiTemplateTabPane.getInstance().repaint(); + } + + private void preProcessMultiTemplateTabPane() { + updateLeadingToolBar(); + } + + /** + * 为前导动作添加监听 + * + * @param l 监听器 + */ + public void addLeadingAction(ActionListener l) { + newTemplateAction = l; + leadingActionButton.removeActionListener(newTemplateAction); + leadingActionButton.addActionListener(newTemplateAction); + } + + public void setToolBarEnable(boolean enable) { + leadingToolBar.setEnabled(enable); } @@ -227,19 +243,18 @@ public class MultiTemplateTabPane extends JComponent { /** * 判断模板是否可以关闭，两个条件：1、是否满足CloseOption里面的条件（在左侧、在右侧等）2、是否和当前正在编辑模板属于同一种模板tab操作类型 - * @param closeJTemplate + * * @param tplIndex * @param i * @return */ - public boolean shouldClose(JTemplate closeJTemplate, int tplIndex, int i) { + public boolean shouldClose(int tplIndex, int i) { boolean matchOption = this.closeOption.shouldClose(tplIndex, i); JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); if (!JTemplate.isValid(currentTemplate)) { return matchOption; } - return matchOption && ComparatorUtils.equals(closeJTemplate.getTemplateTabOperatorType(), - currentTemplate.getTemplateTabOperatorType()); + return matchOption; } } @@ -326,12 +341,7 @@ public class MultiTemplateTabPane extends JComponent { if (OK_OPTION == selVal) { CallbackSaveWorker worker = template.saveAs(); worker.start(template.getRuntimeId()); - worker.addSuccessCallback(new Runnable() { - @Override - public void run() { - gotoEditingTemplateLeaf(template.getPath()); - } - }); + worker.addSuccessCallback(() -> gotoEditingTemplateLeaf(template.getPath())); } } else { gotoEditingTemplateLeaf(template.getPath()); @@ -365,9 +375,9 @@ public class MultiTemplateTabPane extends JComponent { JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); closeTemplate(closeCondition, templates, currentTemplate); - if (openedTemplate.size() == 0) { + if (openedTemplate.isEmpty()) { DesignerContext.getDesignerFrame().addAndActivateJTemplate(); - } else if (option == CloseOption.All){ + } else if (option == CloseOption.All) { //openedTemplate(0)是JVirtualTemplate时需重新打开 openedTemplate.get(0).activeOldJTemplate(); } else { @@ -380,7 +390,7 @@ public class MultiTemplateTabPane extends JComponent { private void closeTemplate(CloseCondition closeCondition, JTemplate[] templates, JTemplate currentTemplate) { for (int i = 0; i < templates.length; i++) { - if (closeCondition.shouldClose(templates[i], tplIndex, i)) { + if (closeCondition.shouldClose(tplIndex, i)) { JTemplate jTemplate = templates[i]; if (jTemplate == currentTemplate) { currentTemplate = option == CloseOption.All ? null : templates[tplIndex]; @@ -415,19 +425,18 @@ public class MultiTemplateTabPane extends JComponent { /** * 关闭所有指定模板tab操作类型的模板 - * @param operatorType */ - public void closeOtherByOperatorType(String operatorType){ + public void closeOther() { JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(false); - if (saveSomeTempaltePane.showSavePane(null, false, true)) { + SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(false); + if (saveSomeTemplatePane.showSavePane(null, false, false)) { List> openedTemplate = HistoryTemplateListCache.getInstance().getHistoryList(); JTemplate[] templates = new JTemplate[openedTemplate.size()]; for (int i = 0; i < openedTemplate.size(); i++) { templates[i] = openedTemplate.get(i); } - closeTemplate(templates, currentEditingTemplate, operatorType); + closeTemplate(templates, currentEditingTemplate); DesignerContext.getDesignerFrame().activateJTemplate(currentEditingTemplate); MultiTemplateTabPane.getInstance().repaint(); @@ -436,15 +445,12 @@ public class MultiTemplateTabPane extends JComponent { /** * 关闭指定的非当前编辑模板 + * * @param templates - * @param operatorType */ - private static void closeTemplate(JTemplate[] templates, JTemplate currentEditingTemplate, String operatorType) { - for (int i = 0; i < templates.length; i++) { - JTemplate jTemplate = templates[i]; - boolean needClose = ComparatorUtils.equals(operatorType, jTemplate.getTemplateTabOperatorType()) - && jTemplate != currentEditingTemplate; - if (!needClose) { + private static void closeTemplate(JTemplate[] templates, JTemplate currentEditingTemplate) { + for (JTemplate jTemplate : templates) { + if (jTemplate == currentEditingTemplate) { continue; } MultiTemplateTabPane.getInstance().closeFormat(jTemplate); @@ -469,91 +475,14 @@ public class MultiTemplateTabPane extends JComponent { } - @Override - public Dimension getPreferredSize() { - Dimension dimension = super.getPreferredSize(); - dimension.height = HEIGHT; - return dimension; - } - - private UIMenuItem initCloseOther() { - UIMenuItem closeOther = new UIMenuItem(Toolkit.i18nText("Fine-Design_Basic_FS_Close_Other_Templates")); - // Yvan: 英文下文本显示不全，后续发现如果将模板名设置的比较短，其它语言也会出现显示不全的问题，所以设置一下文本水平居中 - closeOther.setHorizontalAlignment(SwingConstants.CENTER); - setListDownItemPreferredSize(closeOther); - closeOther.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - if (openedTemplate.size() == 1) { - return; - } - if (!TemplateSavingChecker.check()) { - return; - } - SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(false); - //点击关闭其他模板，并且点击确定保存 - if (saveSomeTempaltePane.showSavePane()) { - JTemplate[] panes = new JTemplate[openedTemplate.size()]; - for (int i = 0; i < openedTemplate.size(); i++) { - panes[i] = openedTemplate.get(i); - } - for (int i = 0; i < panes.length; i++) { - if (i != selectedIndex) { - JTemplate jTemplate = panes[i]; - //判断关闭的模板是不是格式刷的被参照的模板 - openedTemplate.remove(jTemplate); - closeFormat(jTemplate); - HistoryTemplateListCache.getInstance().closeSelectedReport(jTemplate); - closeAndFreeLock(jTemplate); - } - } - JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - HistoryTemplateListCache.getInstance().removeAllHistory(); - DesignerContext.getDesignerFrame().activateJTemplate(currentTemplate); - THIS.repaint(); - } - //如果取消保存了，则不关闭其他模板 - } - }); - if (openedTemplate.size() == 1) { - closeOther.setEnabled(false); - } - return closeOther; - } - - - private UIMenuItem[] createListDownTemplate() { - UIMenuItem[] templates = new UIMenuItem[openedTemplate.size()]; - for (int i = 0; i < openedTemplate.size(); i++) { - final int index = i; - final JTemplate tem = openedTemplate.get(i); - templates[i] = new UIMenuItem(tempalteShowName(tem), tem.getIcon()); - templates[i].setUI(new UIListDownItemUI()); - setListDownItemPreferredSize(templates[i]); - if (i == selectedIndex) { - //画选中的高亮 - templates[i].setBackground(UIConstants.SHADOW_CENTER); - } - templates[i].addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - selectedIndex = index; - tem.activeNewJTemplate(); - } - }); - } - return templates; + public String getTemplateShowNameByIndex(int index) { + JTemplate template = openedTemplate.get(index); + return template.getTabShowName(template); } - private void setListDownItemPreferredSize(UIMenuItem item) { - Dimension dimension = item.getPreferredSize(); - dimension.height = LIST_DOWN_HEIGHT; - item.setPreferredSize(dimension); - } - - - private String tempalteShowName(JTemplate template) { - return template.getTabShowName(template); + public Icon getTemplateIconByIndex(int index) { + JTemplate template = openedTemplate.get(index); + return template.getIcon(); } /** @@ -583,145 +512,23 @@ public class MultiTemplateTabPane extends JComponent { @Override public void paintComponent(Graphics g) { - super.paintComponent(g); - double maxWidth = getWidth() - LIST_BUTTON_WIDTH * 1.0D; //最大宽度 - Graphics2D g2d = (Graphics2D) g; - paintBackgroundAndLine(g2d, maxWidth); - } - - @Override - public void paint(Graphics g) { - //不可见时，按钮.4f透明 - AlphaComposite composite = DesignerMode.isVcsMode() - ? AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.4f) - : (AlphaComposite) ((Graphics2D) g).getComposite(); - ((Graphics2D) g).setComposite(composite); - super.paint(g); - } - - private void paintBackgroundAndLine(Graphics2D g2d, double maxWidth) { - paintDefaultBackground(g2d); - //最多能画的个数 - int maxTemplateNum = (int) (maxWidth) / MINWIDTH; - //计算开始画的最小模板index和最大模板index + double maxWidth = getWidth() - scale(TRAILING_WIDTH) - scale(leadingWidth); //最大宽度 + int maxTemplateNum = (int) (maxWidth) / scale(MINWIDTH); calMinAndMaxIndex(maxTemplateNum); calculateRealAverageWidth(maxWidth, maxTemplateNum); - int maxStringlength = calculateStringMaxLength(); - if (selectedIndex >= openedTemplate.size()) { - selectedIndex = openedTemplate.size() - 1; - } - if (selectedIndex < 0) { - selectedIndex = 0; - } - double templateStartX = 0; - startX = new int[maxPaintIndex - minPaintIndex + 1]; - isNeedToolTips = new boolean[maxPaintIndex - minPaintIndex + 1]; - - //从可以开始展示在tab面板上的tab开始画 - for (int i = minPaintIndex; i <= maxPaintIndex; i++) { - JTemplate template = openedTemplate.get(i); - if (!showJTemplateTab(template)){ - continue; - } - Icon icon = template.getIcon(); - String name = tempalteShowName(template); - //如果tab名字的长度大于最大能显示的英文字符长度，则进行省略号处理 - if (getStringWidth(name) > maxStringlength) { - name = getEllipsisName(name, maxStringlength); - isNeedToolTips[i - minPaintIndex] = true; - } else { - isNeedToolTips[i - minPaintIndex] = false; - } - - Icon selectedIcon; - if (i == closeIconIndex) { - selectedIcon = clodeMode; - } else { - selectedIcon = CLOSE; - } - if (i == selectedIndex) { - if (template.isSaving()) { - selectedIcon = WHITE_SAVING_CLOSE_ICON; - } - startX[i - minPaintIndex] = paintSelectedTab(g2d, icon, templateStartX, name, selectedIcon); - } else { - if (template.isSaving()) { - selectedIcon = GREY_SAVING_CLOSE_ICON; - } - boolean isLeft = i < selectedIndex; - startX[i - minPaintIndex] = paintUnSelectedTab(g2d, icon, templateStartX, name, selectedIcon, isLeft, mouseOveredIndex, i); - } - templateStartX += realWidth; - } - - if (!DesignerMode.isVcsMode()) { - paintListDown(g2d, maxWidth); - } - paintUnderLine(templateStartX, maxWidth, g2d); - } - - - private void paintUnderLine(double templateStartX, double maxWidth, Graphics2D g2d) { - //画下面的那条线 - if (templateStartX < maxWidth) { - GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, 2); - generalPath.moveTo((float) templateStartX, (float) (getHeight() - 1.0D)); - generalPath.lineTo((float) maxWidth, (float) (getHeight() - 1.0D)); - g2d.fill(generalPath); - //TODO hzzz delete -// g2d.setPaint(UIConstants.LINE_COLOR); -// g2d.draw(new Line2D.Double((float) templateStartX, getHeight() - 1, (float) maxWidth + LIST_BUTTON_WIDTH, getHeight() - 1)); - } - } - - private void paintDefaultBackground(Graphics2D g2d) { - //画默认背景 - g2d.setPaint(new GradientPaint(1, 1, UIConstants.TEMPLATE_TAB_PANE_BACKGROUND, 1, (float) (getHeight() - 1.0D), UIConstants.TEMPLATE_TAB_PANE_BACKGROUND)); - g2d.fillRect(0, 0, getWidth(), getHeight()); - } - - - private void paintListDown(Graphics2D g2d, double maxWidth) { - int x = (int) maxWidth + (LIST_BUTTON_WIDTH - listDownMode.getIconWidth()) / 2; - int y = (getHeight() - listDownMode.getIconHeight()) / 2; - listDownMode.paintIcon(this, g2d, x, y); + calculateClosePosition(); + super.paintComponent(g); } - /** - * 判断tab文字的长度大于能装下的最大文字长度，要用省略号 - * - * @param name - * @param maxStringlength - * @return - */ - private String getEllipsisName(String name, int maxStringlength) { - - //若是名字长度大于能显示的长度，那能显示的文字的最大长度还要减去省略号的最大长度 -// int maxellipsislength = maxStringlength - ELLIPSIS.length(); - int ellipsisWidth = getStringWidth(ELLIPSIS); - int leftkeyPoint = 0; - int rightKeyPoint = name.length() - 1; - int leftStrWidth = 0; - int rightStrWidth = 0; - while (leftStrWidth + rightStrWidth + ellipsisWidth < maxStringlength) { - if (leftStrWidth <= rightStrWidth) { - leftkeyPoint++; - } else { - rightKeyPoint--; - } - leftStrWidth = getStringWidth(name.substring(0, leftkeyPoint)); - rightStrWidth = getStringWidth(name.substring(rightKeyPoint)); - - if (leftStrWidth + rightStrWidth + ellipsisWidth > maxStringlength) { - if (leftStrWidth <= rightStrWidth) { - rightKeyPoint++; - } - break; - } + private void calculateClosePosition() { + startX = new int[maxPaintIndex - minPaintIndex + 1]; + double templateStartX = scale(leadingWidth); + for (int i = getViewRange().getFirst(); i <= getViewRange().getSecond(); i++) { + int closePosition = (int) templateStartX + getTabWidth() - clodeIcon.getIconWidth() - GAP; + startX[i - minPaintIndex] = closePosition; + templateStartX += getTabWidth(); } - - return name.substring(0, leftkeyPoint) + ELLIPSIS + name.substring(rightKeyPoint); } private void calMinAndMaxIndex(int maxTemplateNum) { @@ -758,234 +565,26 @@ public class MultiTemplateTabPane extends JComponent { minPaintIndex = 0; maxPaintIndex = openedTemplate.size() - 1; } - //需要根据每个tab的宽度重新check下实际的maxPaintIndex和minPaintIndex - checkActualPaintIndex(); - } - - /** - * 先计算出需要补充的tab个数 - * @return - */ - private int calTabCountComplemented(){ - int a = 0; - for (int i = minPaintIndex; i <= maxPaintIndex; i++) { - JTemplate template = openedTemplate.get(i); - if (!showJTemplateTab(template)) { - a++; - } - } - return a; } /** - * 由于可能存在宽度为0的tab，所以这边需要重新check下，先往后补，再往前补 + * 个数小于最多能容纳的个数的情况下，看看宽度每个要画多少 */ - private void checkActualPaintIndex(){ - int tabCount = calTabCountComplemented(); - if (tabCount == 0){ - return; - } - if (maxPaintIndex < openedTemplate.size() - 1) { - for (int i = maxPaintIndex + 1; i < openedTemplate.size(); i++) { - JTemplate template = openedTemplate.get(i); - if (showJTemplateTab(template)) { - tabCount--; - } - maxPaintIndex++; - if (tabCount == 0){ - return; - } - } - } - if (minPaintIndex > 0){ - for (int i = minPaintIndex - 1; i >= 0; i--) { - JTemplate template = openedTemplate.get(i); - if (showJTemplateTab(template)) { - tabCount--; - } - minPaintIndex--; - if (tabCount == 0){ - return; - } - } - } - } - - - //个数小于最多能容纳的个数的情况下，看看宽度每个要画多少 private void calculateRealAverageWidth(double maxwidth, int templateNum) { - JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - List> showTemplates = getOpenedJTemplatesByOperator(jTemplate.getTemplateTabOperatorType()); - + List> showTemplates = getOpenedJTemplates(); int num = Math.min(showTemplates.size(), templateNum); - realWidth = (int) (maxwidth / (num)); - if (realWidth > MAXWIDTH) { - realWidth = MAXWIDTH; - } else if (realWidth < MINWIDTH) { + tabWidth = (int) (maxwidth / (num)); + if (tabWidth > scale(MAXWIDTH)) { + tabWidth = scale(MAXWIDTH); + } else if (tabWidth < scale(MINWIDTH)) { //平均下来每个的宽度小于最小宽度 - realWidth = MINWIDTH; + tabWidth = scale(MINWIDTH); } } - /** - * 计算过长度之后的每个tab的能接受的文字的英文字符数 - * - * @return - */ - private int calculateStringMaxLength() { - return realWidth - 3 * GAP - ICON_WIDTH - SMALLGAP - CLOSE.getIconWidth(); - - } - - private int getStringWidth(String str) { - return GraphHelper.getFontMetrics(this.getFont()).stringWidth(str); - } - - - /** - * 画选中的tab - * - * @param g2d - * @param sheeticon - * @param templateStartX - * @param sheetName - * @param closeIcon - * @return - */ - private int paintSelectedTab(Graphics2D g2d, Icon sheeticon, double templateStartX, String sheetName, Icon closeIcon) { - double[] x = {templateStartX, templateStartX, templateStartX + realWidth, templateStartX + realWidth, templateStartX}; - double[] y = {1, getHeight() + 1, getHeight() + 1, 1, 1}; - RoundRectangle2D.Double rect1 = new RoundRectangle2D.Double(templateStartX, 1, this.getWidth(), this.getHeight(), 7, 7); - g2d.setPaint(new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, (float) (getHeight() - 1.0D), UIConstants.SELECT_TAB)); - //选了30度和60度的特殊角度的x,y作为经过的两个点的坐标 - double specialLocation1 = 2.5; - double specialLocation2 = 4.330127; - GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length); - generalPath.moveTo((float) x[0] + CORNOR_RADIUS, (float) y[0]); - generalPath.curveTo(((float) x[0] + CORNOR_RADIUS - specialLocation1), (y[0] + CORNOR_RADIUS - specialLocation2), ((float) x[0] + CORNOR_RADIUS - specialLocation2), (y[0] + CORNOR_RADIUS - specialLocation1), x[0], y[0] + CORNOR_RADIUS); - - for (int index = 1; index <= 2; index++) { - generalPath.lineTo((float) x[index], (float) y[index]); - } - - generalPath.lineTo((float) x[3], (float) y[3] + CORNOR_RADIUS); - generalPath.curveTo(((float) x[3] - CORNOR_RADIUS + specialLocation1), ((float) y[3] + CORNOR_RADIUS - specialLocation2), ((float) x[3] - CORNOR_RADIUS + specialLocation2), ((float) y[3] + CORNOR_RADIUS - specialLocation1), (float) x[3] - CORNOR_RADIUS, (float) y[3]); - generalPath.lineTo((float) x[0] + CORNOR_RADIUS, (float) y[0]); - - generalPath.closePath(); - g2d.fill(generalPath); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setPaint(new Color(200, 201, 205)); - g2d.draw(new Arc2D.Double(x[0], y[0], CORNOR_RADIUS * 2, CORNOR_RADIUS * 2, 90, 90, 0)); - g2d.draw(new Line2D.Double(x[0], y[0] + CORNOR_RADIUS, x[1], y[1])); - g2d.draw(new Line2D.Double(x[1], y[1], x[2], y[2])); - g2d.draw(new Line2D.Double(x[2], y[2], x[3], y[3] + CORNOR_RADIUS)); - g2d.draw(new Arc2D.Double(x[3] - CORNOR_RADIUS * 2, y[3], CORNOR_RADIUS * 2, CORNOR_RADIUS * 2, 90, -90, 0)); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - int sheetIconY = (getHeight() - sheeticon.getIconHeight()) / 2; - sheeticon.paintIcon(this, g2d, (int) templateStartX + GAP, sheetIconY); - // 画字符 - g2d.setPaint(getForeground()); - g2d.drawString(sheetName, (int) templateStartX + sheeticon.getIconWidth() + 2 * GAP, getHeight() - GAP * 2); - int closePosition = (int) templateStartX + realWidth - CLOSE.getIconWidth() - SMALLGAP; - int closeY = (getHeight() - closeIcon.getIconHeight()) / 2; - if (!DesignerMode.isVcsMode()) { - closeIcon.paintIcon(this, g2d, closePosition, closeY); - } - return closePosition; - - } - - /** - * 画没有选中的tab - * - * @param g2d - * @param sheeticon - * @param templateStartX - * @param sheetName - * @param closeIcon - * @param isLeft - * @return - */ - private int paintUnSelectedTab(Graphics2D g2d, Icon sheeticon, double templateStartX, String sheetName, Icon closeIcon, boolean isLeft, int mouseOveredIndex, int selfIndex) { - double[] x = {templateStartX, templateStartX, templateStartX + realWidth, templateStartX + realWidth, templateStartX}; - double[] y = {-1, getHeight() - 1, getHeight() - 1, -1, -1}; - if (selfIndex == mouseOveredIndex) { - g2d.setPaint(new GradientPaint(1, 1, UIConstants.HOVER_BLUE, 1, (float) (getHeight() - 1.0D), UIConstants.HOVER_BLUE)); - } else { - g2d.setPaint(new GradientPaint(1, 1, UIConstants.SHADOW_GREY, 1, (float) (getHeight() - 1.0D), UIConstants.SHADOW_GREY)); - } - - - GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length); - - unSelectedClosedPath(generalPath, isLeft, x, y); - g2d.fill(generalPath); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setPaint(UIConstants.TEMPLATE_TAB_PANE_BACKGROUND); - //TODO hzzz delete -// if (isLeft) { -// g2d.draw(new Arc2D.Double(x[0], y[0], CORNOR_RADIUS * 2, CORNOR_RADIUS * 2, 90, 90, 0)); -// } else { -// g2d.draw(new Arc2D.Double(x[0] - CORNOR_RADIUS * 2, y[0], CORNOR_RADIUS * 2, CORNOR_RADIUS * 2, 90, -90, 0)); -// } - -// g2d.draw(new Line2D.Double(x[0], y[0] + CORNOR_RADIUS, x[1], y[1] + 1)); -// g2d.draw(new Line2D.Double(x[1], y[1], x[2], y[2])); - g2d.draw(new Line2D.Double(x[2], y[2], x[3], y[3] + CORNOR_RADIUS)); -// if (isLeft) { -// g2d.draw(new Arc2D.Double(x[3], y[3], CORNOR_RADIUS * 2, CORNOR_RADIUS * 2, 90, 90, 0)); -// } else { -// g2d.draw(new Arc2D.Double(x[3] - CORNOR_RADIUS * 2, y[3], CORNOR_RADIUS * 2, CORNOR_RADIUS * 2, 90, -90, 0)); -// } - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - int sheetIconY = (getHeight() - sheeticon.getIconHeight()) / 2; - sheeticon.paintIcon(this, g2d, (int) templateStartX + GAP, sheetIconY); - // 画字符 - g2d.setPaint(getForeground()); - g2d.drawString(sheetName, (int) templateStartX + sheeticon.getIconWidth() + 2 * GAP, getHeight() - GAP * 2); - int closeY = (getHeight() - closeIcon.getIconHeight()) / 2; - int closePosition = (int) templateStartX + realWidth - CLOSE.getIconWidth() - SMALLGAP; - if (!DesignerMode.isVcsMode()) { - closeIcon.paintIcon(this, g2d, closePosition, closeY); - } - return closePosition; - } - - - private void unSelectedClosedPath(GeneralPath generalPath, boolean isLeft, double[] x, double[] y) { - - if (isLeft) { - generalPath.moveTo((float) x[0] + CORNOR_RADIUS, (float) y[0]); - generalPath.curveTo(((float) x[0] + CORNOR_RADIUS - SPECIAL_LOCATION_1), (y[0] + CORNOR_RADIUS - SPECIAL_LOCATION_2), ((float) x[0] + CORNOR_RADIUS - SPECIAL_LOCATION_2), (y[0] + CORNOR_RADIUS - SPECIAL_LOCATION_1), x[0], y[0] + CORNOR_RADIUS); - } else { - generalPath.moveTo((float) x[0] - CORNOR_RADIUS, (float) y[0]); - generalPath.curveTo(((float) x[0] - CORNOR_RADIUS + SPECIAL_LOCATION_1), (y[0] + CORNOR_RADIUS - SPECIAL_LOCATION_2), ((float) x[0] - CORNOR_RADIUS + SPECIAL_LOCATION_2), (y[0] + CORNOR_RADIUS - SPECIAL_LOCATION_1), x[0], y[0] + CORNOR_RADIUS); - } - - for (int index = 1; index <= 2; index++) { - generalPath.lineTo((float) x[index], (float) y[index]); - } - - generalPath.lineTo((float) x[3], (float) y[3] + CORNOR_RADIUS); - - if (isLeft) { - generalPath.curveTo(((float) x[3] + CORNOR_RADIUS - SPECIAL_LOCATION_1), ((float) y[3] + CORNOR_RADIUS - SPECIAL_LOCATION_2), ((float) x[3] + CORNOR_RADIUS - SPECIAL_LOCATION_2), ((float) y[3] - CORNOR_RADIUS + SPECIAL_LOCATION_1), (float) x[3] + CORNOR_RADIUS, (float) y[3]); - generalPath.lineTo((float) x[0] + CORNOR_RADIUS, (float) y[0]); - } else { - generalPath.curveTo(((float) x[3] - CORNOR_RADIUS + SPECIAL_LOCATION_1), ((float) y[3] + CORNOR_RADIUS - SPECIAL_LOCATION_2), ((float) x[3] - CORNOR_RADIUS + SPECIAL_LOCATION_2), ((float) y[3] + CORNOR_RADIUS - SPECIAL_LOCATION_1), (float) x[3] - CORNOR_RADIUS, (float) y[3]); - generalPath.lineTo((float) x[0] - CORNOR_RADIUS, (float) y[0]); - } - - generalPath.closePath(); - } - - public void setIsCloseCurrent(boolean isCloseCurrent) { this.isCloseCurrent = isCloseCurrent; - } /** @@ -1004,12 +603,9 @@ public class MultiTemplateTabPane extends JComponent { Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION) { CallbackSaveWorker worker = specifiedTemplate.save(); - worker.addSuccessCallback(new Runnable() { - @Override - public void run() { - FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); - closeTpl(specifiedTemplate); - } + worker.addSuccessCallback(() -> { + FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); + closeTpl(specifiedTemplate); }); worker.start(specifiedTemplate.getRuntimeId()); } else if (returnVal == JOptionPane.NO_OPTION) { @@ -1084,9 +680,7 @@ public class MultiTemplateTabPane extends JComponent { // 关闭的模板是当前选中的模板时，需要重新计算下一个待展示的模板的index if (selectedIndex >= maxPaintIndex) { // selectIndex 不会 <0 因为如果关闭的是打开的最后一个模板，那么关闭之后 openedTemplate.isEmpty() = true - selectedIndex = calNextShowJTemplateIndex(selectedIndex - 1); - } else { - selectedIndex = calNextShowJTemplateIndex(selectedIndex); + selectedIndex--; } isCloseCurrent = false; } @@ -1103,21 +697,11 @@ public class MultiTemplateTabPane extends JComponent { } } - /** - * 计算下一个可以展示的模板index - * @param currentIndex - * @return - */ - public int calNextShowJTemplateIndex(int currentIndex) { - JTemplate jTemplate= HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - return MultiTemplateTabUtils.calShowTemplateIndex(currentIndex, openedTemplate, jTemplate.getTemplateTabOperatorType()); - } - private boolean isOverCloseIcon(int evtX) { boolean isOverCloseIcon = false; - for (int i = 0; i < startX.length; i++) { - if (evtX >= startX[i] && evtX <= startX[i] + CLOSE.getIconWidth()) { + for (int x : startX) { + if (evtX >= x && evtX <= x + clodeIcon.getIconWidth()) { isOverCloseIcon = true; break; } @@ -1127,15 +711,27 @@ public class MultiTemplateTabPane extends JComponent { private boolean isOverListDown(int evtX) { - int maxWidth = getWidth() - LIST_BUTTON_WIDTH; + int maxWidth = getWidth() - scale(TRAILING_WIDTH); return evtX >= (maxWidth + SMALLGAP) && evtX <= (getWidth() - SMALLGAP); } + /** + * 判断是否在tab栏空白区 + * + * @param evtX x坐标 + * @return 是否在tab栏空白区 + */ + private boolean isOverBlank(int evtX) { + int tabWidths = (maxPaintIndex - minPaintIndex + 1) * tabWidth; + int leftX = tabWidths + scale(leadingWidth); + return evtX >= leftX && evtX <= getWidth() - scale(TRAILING_WIDTH); + } + private int getTemplateIndex(int evtX) { - int textX = 0; + int textX = scale(leadingWidth); for (int i = minPaintIndex; i <= maxPaintIndex; i++) { - int textWidth = showJTemplateTab(openedTemplate.get(i)) ? realWidth : 0; + int textWidth = tabWidth; if (evtX >= textX && evtX < textX + textWidth) { return i; } @@ -1167,35 +763,7 @@ public class MultiTemplateTabPane extends JComponent { } } - private class UIListDownItemUI extends BasicMenuItemUI { - @Override - protected void paintBackground(Graphics g, JMenuItem menuItem, Color bgColor) { - if (menuItem.getIcon() == null) { - super.paintBackground(g, menuItem, bgColor); - return; - } - ButtonModel model = menuItem.getModel(); - Color oldColor = g.getColor(); - int menuWidth = menuItem.getWidth(); - int menuHeight = menuItem.getHeight(); - g.setColor(UIConstants.NORMAL_BACKGROUND); - g.fillRect(0, 0, menuWidth, menuHeight); - boolean itemIsSelected = menuItem instanceof JMenu && model.isSelected(); - if (menuItem.isOpaque()) { - if (model.isArmed() || itemIsSelected) { - GUIPaintUtils.fillPaint((Graphics2D) g, GAP, 0, menuWidth - GAP, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, UIConstants.ARC); - } else { - GUIPaintUtils.fillPaint((Graphics2D) g, GAP, 0, menuWidth - GAP, menuHeight, true, Constants.NULL, menuItem.getBackground(), UIConstants.ARC); - } - g.setColor(oldColor); - } else if (model.isArmed() || itemIsSelected) { - GUIPaintUtils.fillPaint((Graphics2D) g, GAP, 0, menuWidth - GAP, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, UIConstants.ARC); - g.setColor(oldColor); - } - } - } - - private class MultiTemplateTabMouseListener implements MouseListener { + private class MultiTemplateTabMouseListener extends MouseAdapter { private boolean oldLightWeightPopupEnabled; @@ -1220,30 +788,19 @@ public class MultiTemplateTabPane extends JComponent { ToolTipManager.sharedInstance().setEnabled(false); ToolTipManager.sharedInstance().setEnabled(true); ToolTipManager.sharedInstance().setLightWeightPopupEnabled(this.oldLightWeightPopupEnabled); - listDownMode = LIST_DOWN; closeIconIndex = -1; mouseOveredIndex = -1; + hoverMoreAction = false; MultiTemplateTabPane.this.repaint(); } - /** - * 鼠标释放 - * - * @param e 鼠标事件 - */ - @Override - public void mouseReleased(MouseEvent e) { - // do nothing - } - - /** - * 点击 - * - * @param e 鼠标事件 - */ @Override public void mouseClicked(MouseEvent e) { - // do nothing + // 双击添加模板 + if (e.getClickCount() == DOUBLE_CLICK + && isOverBlank(e.getX())) { + newTemplateAction.actionPerformed(null); + } } /** @@ -1262,8 +819,9 @@ public class MultiTemplateTabPane extends JComponent { //是否点击关闭按钮 如果点击了关闭按钮，则将点击的模板关闭，不需要切换，如果没有点击关闭按钮，则切换到点击的模板处 boolean isOverCloseIcon = isOverCloseIcon(evtX); - if (isOverListDown(evtX)) { - listDownMode = isOverListDown(evtX) ? MOUSE_PRESS_LIST_DOWN : LIST_DOWN; + hoverMoreAction = isOverListDown(evtX); + if (hoverMoreAction) { + if (!isShowList) { showListDown(); } @@ -1272,7 +830,6 @@ public class MultiTemplateTabPane extends JComponent { } else if (isOverCloseIcon) { //关闭按钮的图标变化 closeIconIndex = getTemplateIndex(evtX); - clodeMode = MOUSE_PRESS_CLOSE; //关闭close图标所在的模板{ JTemplate template = openedTemplate.get(closeIconIndex); if (template.isOpening()) { @@ -1296,8 +853,9 @@ public class MultiTemplateTabPane extends JComponent { } else { //没有点击关闭和ListDown按钮，则切换到点击的模板处 closeIconIndex = -1; - clodeMode = CLOSE; DesignCacheManager.processByCacheTableData(() -> switchJTemplate(getTemplateIndex(evtX))); + clodeIcon = new LazyIcon("clear"); + switchJTemplate(getTemplateIndex(evtX)); isShowList = false; } MultiTemplateTabPane.this.repaint(); @@ -1306,6 +864,7 @@ public class MultiTemplateTabPane extends JComponent { /** * 切换到指定模板 + * * @param jTemplate */ public void switchJTemplate(JTemplate jTemplate) { @@ -1317,9 +876,10 @@ public class MultiTemplateTabPane extends JComponent { /** * 切换到指定index + * * @param switchIndex */ - private void switchJTemplate(int switchIndex){ + private void switchJTemplate(int switchIndex) { int tempSelectedIndex = selectedIndex; if (selectedIndex != switchIndex && switchIndex != -1) { openedTemplate.get(selectedIndex).stopEditing(); @@ -1342,17 +902,7 @@ public class MultiTemplateTabPane extends JComponent { return JTemplate.isValid(currentTemplate) && ComparatorUtils.equals(template.getPath(), currentTemplate.getPath()); } - private class MultiTemplateTabMouseMotionListener implements MouseMotionListener { - /** - * 鼠标拖拽 - * - * @param e 鼠标事件 - */ - @Override - public void mouseDragged(MouseEvent e) { - // do nothing - } - + private class MultiTemplateTabMouseMotionListener extends MouseMotionAdapter { /** * 鼠标移动 * @@ -1362,51 +912,155 @@ public class MultiTemplateTabPane extends JComponent { public void mouseMoved(MouseEvent e) { int evtX = e.getX(); mouseOveredIndex = getTemplateIndex(evtX); - - //看是否需要显示toolTip - if (mouseOveredIndex != -1 && isNeedToolTips[mouseOveredIndex - minPaintIndex]) { + if (mouseOveredIndex > -1) { setToolTipText(openedTemplate.get(mouseOveredIndex).getEditingFILE().getName()); - } else { - setToolTipText(null); } - - listDownMode = isOverListDown(evtX) ? MOUSE_OVER_LIST_DOWN : LIST_DOWN; - - boolean isOverCloseIcon = isOverCloseIcon(evtX); - clodeMode = isOverCloseIcon ? MOUSE_OVER_CLOSE : CLOSE; - closeIconIndex = isOverCloseIcon ? mouseOveredIndex : -1; + hoverMoreAction = isOverListDown(evtX); + closeIconIndex = isOverCloseIcon(evtX) ? mouseOveredIndex : -1; MultiTemplateTabPane.this.repaint(); } } /** - * 判断是否显示在tab栏上 - * @param jTemplate - * @return + * 获取所有模板 + * + * @return 所有模板列表，不可修改 + */ + public List> getOpenedJTemplates() { + return Collections.unmodifiableList(openedTemplate); + } + + /** + * 返回当前tab数量 + * + * @return tab数量 + */ + public int getTabCount() { + return openedTemplate.size(); + } + + /** + * 获取选中的tab索引 + * + * @return tab索引 + */ + public int getSelectedIndex() { + return selectedIndex; + } + + /** + * 获取每个tab宽度 + * + * @return tab宽度 */ - private boolean showJTemplateTab(JTemplate jTemplate){ - JTemplate current = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); - return ComparatorUtils.equals(current.getTemplateTabOperatorType(), jTemplate.getTemplateTabOperatorType()); + public int getTabWidth() { + return tabWidth; } /** - * 获取tab操作类型的模板 - * @param operator + * 是否悬浮在更多按钮上 + * + * @return 是否悬浮 + */ + public boolean isHoverMoreAction() { + return hoverMoreAction; + } + + /** + * 是否悬浮在关闭按钮上0 + * + * @param i 索引 + * @return 是否悬浮在关闭按钮上 + */ + public boolean isCloseCurrent(int i) { + return i == closeIconIndex; + } + + /** + * 获取悬浮索引 + * + * @return 悬浮在第几个tab + */ + public int getHoverIndex() { + return mouseOveredIndex; + } + + /** + * 获取可视范围内的标签范围 + * + * @return 标签范围 + */ + public Pair getViewRange() { + return new Pair<>(minPaintIndex, maxPaintIndex); + } + + /** + * 获取前导区多模板工具按钮 + * + * @return 工具按钮 + */ + public UIToolbar getLeadingToolBar() { + return this.leadingToolBar; + } + + /** + * 生成前导区多模板工具按钮 + */ + public void updateLeadingToolBar() { + createLeadingToolBarDef().updateToolBar(getLeadingToolBar()); + leadingWidth = getLeadingToolBar().getComponentCount() * SINGLE_BUTTON_WIDTH; + getLeadingToolBar().setLayout(new FlowLayout(FlowLayout.LEFT, FineUIScale.scale(14), 0)); + } + + /** + * 创建新建模板的前导区工具按钮 * @return */ - public List> getOpenedJTemplatesByOperator(String operator) { - return openedTemplate.stream().filter((jTemplate) -> ComparatorUtils.equals(jTemplate.getTemplateTabOperatorType(), operator)) - .collect(Collectors.toList()); + private ToolBarDef createLeadingToolBarDef() { + ToolBarDef toolBarDef = ShortCut.asToolBarDef(createNewTemplateShortCuts()); + insertLeadingToolButton(toolBarDef, MultiTemplateTabPaneHandler.LEADING_LOCATION); + return toolBarDef; } /** - * 根据tab操作类型进行分类 + * 创建新建文件的按钮数组 * @return */ - public Map>> getOpenedJTemplatesByCategory() { - return openedTemplate.stream() - .collect(Collectors.groupingBy(JTemplate::getTemplateTabOperatorType)); + public ShortCut[] createNewTemplateShortCuts() { + ArrayList shortCuts = new ArrayList(); + shortCuts.add(new NewWorkBookToolButtonAction()); + return shortCuts.toArray(new ShortCut[0]); } + /** + * 插入插件中的按钮 + * @return + */ + protected void insertLeadingToolButton(ToolBarDef toolBarDef, String anchor) { + Set set = ExtraDesignClassManager.getInstance().getArray(MultiTemplateTabPaneHandler.MARK_STRING); + List target = new ArrayList<>(); + for (MultiTemplateTabPaneHandler handler : set) { + if (ComparatorUtils.equals(handler.category(), anchor)) { + target.add(handler); + } + } + + for (MultiTemplateTabPaneHandler handler : target) { + int insertPosition = handler.insertPosition(toolBarDef.getShortCutCount()); + if (insertPosition == MenuHandler.HIDE) { + return; + } + ShortCut shortCut = handler.shortcut(); + if (shortCut == null) { + continue; + } + + if (insertPosition == MenuHandler.LAST) { + toolBarDef.addShortCut(shortCut); + } else { + toolBarDef.insertShortCut(insertPosition, shortCut); + } + } + } } diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabUtils.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabUtils.java deleted file mode 100644 index 344abe64f2..0000000000 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabUtils.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.fr.design.file; - -import com.fr.design.mainframe.JTemplate; -import com.fr.general.ComparatorUtils; - -import java.util.List; -import java.util.function.Predicate; - -public class MultiTemplateTabUtils { - /** - * 计算离currentIndex最近的相同模式的模板index值（优先左边） - * - * @param currentIndex 当前index - * @param openedTemplate 模板list - * @param type 当前显示模式 - * @return - */ - public static int calShowTemplateIndex(int currentIndex, List> openedTemplate, String type) { - if (currentIndex < 0 || currentIndex > openedTemplate.size() - 1) { - return -1; - } - int result = getShowJTemplateTab(currentIndex, openedTemplate, template -> showJTemplateTab(type, template)); - if (result != -1) return result; - return getShowJTemplateTab(currentIndex, openedTemplate, template -> !showJTemplateTab(type, template)); - } - - /** - * 先从左找，再从右找离得最近的满足条件的模板 - * - * @param currentIndex 当前index - * @param openedTemplate 模板list - * @param predicate - * @return - */ - private static int getShowJTemplateTab(int currentIndex, List> openedTemplate, Predicate> predicate) { - for (int i = currentIndex; i >= 0; i--) { - if (predicate.test(openedTemplate.get(i))) { - return i; - } - } - for (int i = currentIndex + 1; i < openedTemplate.size(); i++) { - if (predicate.test(openedTemplate.get(i))) { - return i; - } - } - return -1; - } - - /** - * 是否显示模板 - * - * @param type 模板类型 - * @param jTemplate 模板 - * @return - */ - private static boolean showJTemplateTab(String type, JTemplate jTemplate) { - return ComparatorUtils.equals(type, jTemplate.getTemplateTabOperatorType()); - } -} diff --git a/designer-base/src/main/java/com/fr/design/file/NewTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/NewTemplatePane.java deleted file mode 100644 index 81f82e78c6..0000000000 --- a/designer-base/src/main/java/com/fr/design/file/NewTemplatePane.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.fr.design.file; - -import com.fr.base.BaseUtils; -import com.fr.base.vcs.DesignerMode; -import com.fr.design.constants.UIConstants; -import com.fr.design.mainframe.DesignerContext; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; -import java.awt.geom.Line2D; -import java.awt.geom.Rectangle2D; - -/** - * Author : daisy - * Date: 13-8-27 - * Time: 下午6:07 - */ -public abstract class NewTemplatePane extends JComponent implements MouseListener, MouseMotionListener { - - private static final Icon GRAY_NEW_CPT = BaseUtils.readIcon("/com/fr/design/images/buttonicon/additicon_grey.png"); - private static final int ICON_START_X = 5; - private static final int HEIGHT = 26; - private Graphics2D g2d; - private Icon newWorkBookIconMode = null; - - - public NewTemplatePane() { - newWorkBookIconMode = getNew(); - this.setLayout(new BorderLayout(0, 0)); - this.addMouseListener(this); - this.addMouseMotionListener(this); - this.setBorder(null); - this.setForeground(new Color(99, 99, 99)); - } - - public Dimension getPreferredSize() { - Dimension dim = super.getPreferredSize(); - dim.width = HEIGHT; - return dim; - } - - - public void paintComponent(Graphics g) { - super.paintComponent(g); - g2d = (Graphics2D) g; - g2d.setColor(UIConstants.TEMPLATE_TAB_PANE_BACKGROUND); - g2d.fill(new Rectangle2D.Double(0, 0, getWidth(),getHeight())); - int sheetIconY = (getHeight() - newWorkBookIconMode.getIconHeight()) / 2; - newWorkBookIconMode.paintIcon(this, g2d, ICON_START_X, sheetIconY); -// paintUnderLine(g2d); - } - - - private void paintUnderLine(Graphics2D g2d) { - //画下面的那条线 - g2d.setPaint(UIConstants.LINE_COLOR); - g2d.draw(new Line2D.Double((float) 0, (float) (getHeight()-1), getWidth(), (float) (getHeight()-1))); - } - - /** - *鼠标点击 - * @param e 事件 - */ - public void mouseClicked(MouseEvent e) { - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } - } - - /** - *鼠标按下 - * @param e 事件 - */ - public void mousePressed(MouseEvent e) { - int evtX = e.getX(); - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } - if (isOverNewIcon(evtX) && newWorkBookIconMode != GRAY_NEW_CPT) { - newWorkBookIconMode = getMousePressNew(); - createNewTemplate(); - } - this.repaint(); - } - - - /** - * 新建模板 - */ - protected void createNewTemplate() { - DesignerContext.getDesignerFrame().addAndActivateJTemplate(); - } - - /** - *鼠标松开 - * @param e 事件 - */ - public void mouseReleased(MouseEvent e) { - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } - } - - /** - *鼠标进入 - * @param e 事件 - */ - public void mouseEntered(MouseEvent e) { - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } - } - - /** - *鼠标离开 - * @param e 事件 - */ - public void mouseExited(MouseEvent e) { - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } else { - newWorkBookIconMode = getNew(); - } - - this.repaint(); - } - - /** - *鼠标拖拽 - * @param e 事件 - */ - public void mouseDragged(MouseEvent e) { - } - - /** - *鼠标移动 - * @param e 事件 - */ - public void mouseMoved(MouseEvent e) { - int evtX = e.getX(); - if (needGrayNewCpt()) { - newWorkBookIconMode = GRAY_NEW_CPT; - } else if (isOverNewIcon(evtX)) { - newWorkBookIconMode = getMouseOverNew(); - } - - this.repaint(); - - } - - private boolean needGrayNewCpt() { - return DesignerMode.isAuthorityEditing() || DesignerMode.isVcsMode(); - } - - - private boolean isOverNewIcon(int evtX) { - return (evtX >= ICON_START_X && evtX <= ICON_START_X + newWorkBookIconMode.getIconWidth()); - } - - public void setButtonGray(boolean isGray) { - newWorkBookIconMode = isGray ? GRAY_NEW_CPT : getNew(); - } - - public abstract Icon getNew(); - - public abstract Icon getMouseOverNew(); - - public abstract Icon getMousePressNew(); - -} diff --git a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java index 1517309ef1..8ee5c61fb2 100644 --- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java @@ -1,28 +1,35 @@ package com.fr.design.file; +import com.fine.theme.light.ui.FineRoundBorder; +import com.formdev.flatlaf.util.SystemInfo; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; -import com.fr.design.dialog.FineJOptionPane; import com.fr.design.event.StateChangeListener; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.UIList; +import com.fr.design.gui.iscrollbar.UIScrollBarUI; import com.fr.design.gui.itree.checkboxtree.NullTristateCheckBox; import com.fr.design.gui.itree.checkboxtree.TristateCheckBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; - import com.fr.log.FineLoggerFactory; import org.jetbrains.annotations.Nullable; -import javax.swing.*; -import javax.swing.border.EmptyBorder; -import java.awt.*; -import java.awt.event.*; +import javax.swing.AbstractListModel; +import javax.swing.BorderFactory; +import javax.swing.DefaultListCellRenderer; +import javax.swing.JList; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Window; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.ArrayList; /** @@ -77,13 +84,16 @@ public class SaveSomeTemplatePane extends BasicPane { this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); + scrollPane.setBorder(new FineRoundBorder()); + if (SystemInfo.isWindows) { + scrollPane.getVerticalScrollBar().setUI(new UIScrollBarUI()); + } this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane(boolean judgeJTemplateMustSave) { - templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); @@ -215,7 +225,7 @@ public class SaveSomeTemplatePane extends BasicPane { int currentIndex = opendedTemplate.indexOf(currentTemplate); for (int i = 0; i < opendedTemplate.size(); i++) { //满足关闭条件的才继续判断文件是否发生了改动 - boolean needClose = option == null || option.shouldClose(opendedTemplate.get(i), currentIndex, i); + boolean needClose = option == null || option.shouldClose(currentIndex, i); if (judgeSameTabType) { needClose &= ComparatorUtils.equals(opendedTemplate.get(i).getTemplateTabOperatorType(), currentTemplate.getTemplateTabOperatorType()); } diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateListMenuItem.java b/designer-base/src/main/java/com/fr/design/file/TemplateListMenuItem.java new file mode 100644 index 0000000000..907bc96ba8 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/file/TemplateListMenuItem.java @@ -0,0 +1,156 @@ +package com.fr.design.file; + +import com.fine.swing.ui.layout.Row; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.constants.UIConstants; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.mainframe.JTemplate; +import com.fr.design.utils.TemplateUtils; + +import javax.swing.JPopupMenu; +import javax.swing.SwingConstants; +import javax.swing.UIManager; +import java.awt.Dimension; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import static com.fine.swing.ui.layout.Layouts.cell; + +/** + * menu的item由模板图标、模板名、模板关闭按钮组成 + * + * @author vito + * @since 9.0 + * Created on 2015.1 + */ +public class TemplateListMenuItem extends Row { + private static final String UI_CLASS_ID = "TemplateListMenuItemUI"; + private static final String UNSAVED_SUFFIX = " *"; + + private static final int WIDTH = 200; + + private final UIButton templateButton; + private final UIButton closeButton; + private final JPopupMenu menu; + + public TemplateListMenuItem(JPopupMenu menu, JTemplate template) { + this.menu = menu; + templateButton = createTemplateButton(template); + closeButton = createCloseButton(); + add( + cell(templateButton).weight(1), + cell(closeButton) + ); + setBorder(new ScaledEmptyBorder(0, 4, 0, 4)); + setPreferredSize(new Dimension(FineUIScale.scale(WIDTH), templateButton.getPreferredSize().height)); + initListener(template); + } + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + + /** + * item[1] 切换模板按钮初始化 + */ + private UIButton createTemplateButton(JTemplate template) { + String templateName = template.getTemplateName(); + if (!template.isSaved() && !templateName.endsWith(UNSAVED_SUFFIX)) { + templateName += UNSAVED_SUFFIX; + } + UIButton button = new UIButton( + TemplateUtils.createLockeTemplatedName(template, templateName), template.getIcon()); + button.setContentAreaFilled(false); + button.setHorizontalAlignment(SwingConstants.LEFT); + if (template == HistoryTemplateListCache.getInstance().getCurrentEditingTemplate()) { + button.setForeground(UIConstants.FLESH_BLUE); + } + return button; + } + + /** + * item[2] 关闭模板图标按钮初始化 + */ + private UIButton createCloseButton() { + UIButton button = new UIButton( + new LazyIcon("clear"), + new LazyIcon("clear_hover"), + new LazyIcon("clear_hover")); + button.setContentAreaFilled(false); + button.setVisible(false); + return button; + } + + private void initListener(JTemplate template) { + initTemplateButtonListener(template); + initCloseButtonListener(template); + } + + /** + * item[1] 切换模板按钮鼠标事件 + */ + private void initTemplateButtonListener(JTemplate template) { + templateButton.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + menu.setVisible(false); + MultiTemplateTabPane.getInstance().switchJTemplate(template); + } + + @Override + public void mouseEntered(MouseEvent e) { + fireMouseEnteredEvent(); + } + + @Override + public void mouseExited(MouseEvent e) { + fireMouseExitedEvent(); + } + }); + } + + /** + * item[2] 关闭模板按钮鼠标事件 + */ + private void initCloseButtonListener(JTemplate template) { + closeButton.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + menu.setVisible(false); + MultiTemplateTabPane.getInstance().setIsCloseCurrent(template == HistoryTemplateListCache.getInstance().getCurrentEditingTemplate()); + MultiTemplateTabPane.getInstance().closeFormat(template); + MultiTemplateTabPane.getInstance().closeSpecifiedTemplate(template); + } + + @Override + public void mouseEntered(MouseEvent e) { + fireMouseEnteredEvent(); + } + + @Override + public void mouseExited(MouseEvent e) { + fireMouseExitedEvent(); + } + }); + } + + /** + * mouse移入item范围 + */ + private void fireMouseEnteredEvent() { + TemplateListMenuItem.this.setBackground(UIManager.getColor("MenuItem.selectionBackground")); + closeButton.setVisible(true); + } + + /** + * mouse移出item范围 + */ + private void fireMouseExitedEvent() { + TemplateListMenuItem.this.setBackground(TemplateListMenuItem.this.getParent().getBackground()); + closeButton.setVisible(false); + } + +} diff --git a/designer-base/src/main/java/com/fr/design/foldablepane/HeaderPane.java b/designer-base/src/main/java/com/fr/design/foldablepane/HeaderPane.java index 31cc290324..461aa3bccd 100644 --- a/designer-base/src/main/java/com/fr/design/foldablepane/HeaderPane.java +++ b/designer-base/src/main/java/com/fr/design/foldablepane/HeaderPane.java @@ -1,122 +1,60 @@ package com.fr.design.foldablepane; -import com.fr.base.GraphHelper; -import com.fr.design.constants.UIConstants; -import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxUtilities; +import com.formdev.flatlaf.util.ScaledEmptyBorder; -import javax.swing.*; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.util.Map; +import javax.swing.JPanel; +import javax.swing.UIManager; /** * Created by MoMeak on 2017/7/5. */ public class HeaderPane extends JPanel { private static final long serialVersionUID = 1L; - private static final int TITLE_X = 5; - private static final int LEFT_X = 16; - private static final int LEFT_Y = 6; - private static final int NORMAL_FONTSIZE = 12; - private int headWidth; - private int headHeight; - private Color bgColor; + + public static final String CLASS_ID = "HeaderPaneUI"; private boolean isShow; private boolean isPressed = false; private String title; - private Image image; - private int fontSize; - - public void setPressed(boolean pressed) { - this.isPressed = pressed; - } - - public void setShow(boolean isShow) { - this.isShow = isShow; - } - public void setTitle(String title) { - this.title = title; + @Override + public String getUIClassID() { + return CLASS_ID; } - public void setHeadWidth(int headwidth) { - this.headWidth = headwidth; - } - public void setheadHeight(int headHeight) { - this.headHeight = headHeight; + public void setPressed(boolean pressed) { + this.isPressed = pressed; } - public void setFontSize(int fontSize) { - this.fontSize = fontSize; + public boolean isPressed() { + return isPressed; } - - @Override - protected void paintComponent(Graphics g) { - Graphics2D g2d = (Graphics2D) g.create(); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - BufferedImage panelImage = createPanelImage(); - g2d.drawImage(panelImage, null, 0, 0); - GraphHelper.drawString(g2d, this.title, TITLE_X, headHeight - fontSize / 2 - 1); + public void setShow(boolean isShow) { + this.isShow = isShow; } - private BufferedImage createPanelImage() { - BufferedImage panelImage = new BufferedImage(getWidth(), headHeight, BufferedImage.TYPE_INT_ARGB); - Graphics2D g2d = panelImage.createGraphics(); - - g2d.setColor(isPressed ? UIConstants.POPUP_TITLE_BACKGROUND : UIConstants.COMPONENT_BACKGROUND_COLOR); - headWidth = this.getWidth(); - g2d.fillRect(0, 0, headWidth, headHeight); - g2d.setFont(new Font("SimSun", 0, fontSize)); - g2d.setPaint(bgColor); - Map desktopHints = RSyntaxUtilities.getDesktopAntiAliasHints(); - if (desktopHints != null) { - g2d.setRenderingHints(desktopHints); - } - int leftWdith = headWidth - LEFT_X; - if (this.isShow) { - image = UIConstants.DRAG_DOWN_SELECTED_SMALL; - g2d.drawImage(image, leftWdith, LEFT_Y, null); - } else { - image = UIConstants.DRAG_LEFT_NORMAL_SMALL; - g2d.drawImage(image, leftWdith, LEFT_Y, null); - } - return panelImage; + public boolean isShow() { + return isShow; } - @Override - public Dimension getPreferredSize() { - return new Dimension(this.getWidth(), headHeight); + public void setTitle(String title) { + this.title = title; } - @Override - public Dimension getSize() { - return new Dimension(this.getWidth(), headHeight); + public String getTitle() { + return title; } - public HeaderPane(Color bgColor) { - this.bgColor = bgColor; + public HeaderPane() { this.isShow = true; - + this.setForeground(UIManager.getColor("ExpandablePane.HeaderPane.foreground")); + this.setBorder(new ScaledEmptyBorder(17, 0, 17, 0)); } - public HeaderPane(Color bgColor, String title, int headHeight) { - this(bgColor); + public HeaderPane(String title) { + this(); this.title = title; - this.headHeight = headHeight; - this.fontSize = NORMAL_FONTSIZE; - } - - public static void main(String[] args) { - JFrame mainFrame = new JFrame("UI Demo - Gloomyfish"); - mainFrame.getContentPane().setLayout(new BorderLayout()); - mainFrame.getContentPane().add(new HeaderPane(Color.black, "基本", 24), BorderLayout.CENTER); - mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - mainFrame.pack(); - mainFrame.setSize(300, 400); - mainFrame.setVisible(true); } } diff --git a/designer-base/src/main/java/com/fr/design/foldablepane/UIExpandablePane.java b/designer-base/src/main/java/com/fr/design/foldablepane/UIExpandablePane.java index 9ed2d9757b..140aa74c83 100644 --- a/designer-base/src/main/java/com/fr/design/foldablepane/UIExpandablePane.java +++ b/designer-base/src/main/java/com/fr/design/foldablepane/UIExpandablePane.java @@ -1,17 +1,25 @@ package com.fr.design.foldablepane; -import javax.swing.*; -import java.awt.*; + +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.border.FineBorderFactory; + +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Color; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; + /** * Created by MoMeak on 2017/7/5. */ public class UIExpandablePane extends JPanel { - private static final int LEFT_BORDER = 5; private static final long serialVersionUID = 1L; private HeaderPane headerPanel; private JPanel contentPanel; @@ -30,30 +38,42 @@ public class UIExpandablePane extends JPanel { this.headWidth = headWidth; this.headHeight = headHeight; this.contentPanel = contentPanel; - initComponents(); + initComponents(false); + } + + public UIExpandablePane(String title, JPanel contentPanel) { + this(title, contentPanel, false); } - public UIExpandablePane(String title, int headHeight, JPanel contentPanel) { + public UIExpandablePane(String title, JPanel contentPanel, boolean withUnderline) { super(); this.title = title; this.headHeight = headHeight; this.contentPanel = contentPanel; - initComponents(); + initComponents(withUnderline); } - private void initComponents() { + private void initComponents(boolean withUnderline) { this.setLayout(new BorderLayout()); - headerPanel = new HeaderPane(color, title, headHeight); + headerPanel = new HeaderPane(title); headerPanel.addMouseListener(new PanelAction()); - setcontentPanelontentPanelBorder (); + setcontentPanelontentPanelBorder(); this.add(headerPanel, BorderLayout.NORTH); this.add(contentPanel, BorderLayout.CENTER); + if (withUnderline) { + this.add(column( + cell(headerPanel), cell(contentPanel).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, 10, 0))), + fix(1).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder()))) + .getComponent()); + } else { + this.add(column(cell(headerPanel), cell(contentPanel)).getComponent()); + } + setOpaque(false); } - protected void setcontentPanelontentPanelBorder (){ - contentPanel.setBorder(BorderFactory.createEmptyBorder(0 ,LEFT_BORDER, 0, 0)); + protected void setcontentPanelontentPanelBorder() { } @@ -87,21 +107,4 @@ public class UIExpandablePane extends JPanel { } } - - public static void main(String[] args) { -// JFrame jf = new JFrame("test"); -// jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); -// JPanel content = (JPanel) jf.getContentPane(); -// content.setLayout(new BorderLayout()); -// JPanel myPanel = new JPanel(); -// myPanel.setLayout(new BorderLayout()); -// JPanel Panel = new JPanel(); -// Panel.setBackground(Color.blue); -// myPanel.add(new UIExpandablePane("基本", 223, 24, Panel), BorderLayout.CENTER); -// content.add(myPanel, BorderLayout.CENTER); -// GUICoreUtils.centerWindow(jf); -// jf.setSize(439, 400); -// jf.setVisible(true); - } - } diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java index f41c044b74..5e4eca0ca4 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java @@ -1,5 +1,11 @@ package com.fr.design.formula; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseFormula; import com.fr.base.BaseUtils; import com.fr.base.Parameter; @@ -9,8 +15,9 @@ import com.fr.base.Utils; import com.fr.base.io.IOFile; import com.fr.data.TableDataSource; import com.fr.design.actions.UpdateAction; -import com.fr.design.border.UIRoundedBorder; -import com.fr.design.constants.UIConstants; +import com.fr.design.border.FineBorderFactory; +import com.fr.design.constants.LayoutConstants; +import com.fr.design.data.datapane.management.search.pane.FineSearchPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; @@ -34,7 +41,6 @@ import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants; -import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; @@ -67,7 +73,6 @@ import com.fr.stable.script.Tiny; import com.fr.stable.script.TinyHunter; import java.awt.Window; -import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; import javax.swing.Icon; @@ -79,6 +84,7 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; import javax.swing.JTree; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; @@ -93,7 +99,6 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; @@ -121,6 +126,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; + /** * 公式编辑面板 * @@ -129,16 +137,15 @@ import java.util.Set; */ @EnableMetrics public class FormulaPane extends BasicPane implements KeyListener, UIFormula { - public static final int DEFUAL_FOMULA_LENGTH = 103; + public static final int DEFUAL_FOMULA_LENGTH = FineUIScale.scale(103); public static final String ELLIPSIS = "..."; public static final char KEY_CODE_A = 'A'; public static final char KEY_CODE_Z = 'z'; public static final String NEWLINE = "\n"; - public static final String FORMULA_ICON = "/com/fr/design/images/m_file/formula.png"; - public static final String PARAM_ICON = "/com/fr/design/images/m_file/param.png"; private VariableTreeAndDescriptionArea variableTreeAndDescriptionArea; private RSyntaxTextArea formulaTextArea; private UITextField keyWordTextField = new UITextField(18); + private FineSearchPane searchPane = new FineSearchPane(); private int currentPosition = 0; private int beginPosition = 0; private int insertPosition = 0; @@ -157,8 +164,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { private DefaultCompletionProvider completionProvider; private static final Map PARAM_PREFIX_MAP = new HashMap<>(); - public static final int DESCRIPTION_TEXT_AREA_ROW = 16, DESCRIPTION_TEXT_AREA_COLUMN = 27; - public FormulaPane() { initComponents(); } @@ -231,7 +236,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { } private void initKeyWordTextFieldKeyListener() { - keyWordTextField.addKeyListener(new KeyListener() { + searchPane.addClearActionListener(e -> searchPane.setText(StringUtils.EMPTY)); + searchPane.addKeyListener(new KeyListener() { @Override public void keyTyped(KeyEvent e) { //do nothing @@ -245,58 +251,50 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { - String toFind = keyWordTextField.getText(); + String toFind = searchPane.getText(); search(toFind, false); + popTips(); + searchPane.requestFocusInWindow(); if (tipsList.getSelectedValue() != null) { fixFunctionNameList(tipsList.getSelectedValue().toString()); } e.consume(); + + } } }); } - private void initTipsPane() { + private JPanel initTipsPane() { // tipsPane - JPanel containerSPane = new JPanel(new BorderLayout(4, 1)); - JPanel labelPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0), true); - JPanel searchPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, 0, 0), true); - containerSPane.setPreferredSize(new Dimension(892, 23)); - this.add(containerSPane, BorderLayout.NORTH); - - UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Search")); + searchPane.setPlaceholder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tree_Search_Press_Enter_For_Search")); UILabel formulaLabel = new UILabel( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":"); - formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); - - labelPane.add(formulaLabel, BorderLayout.WEST); - keyWordTextField.setPreferredSize(new Dimension(240, 23)); - searchPane.add(keyWordTextField, BorderLayout.EAST); - searchPane.add(searchButton, BorderLayout.EAST); - - containerSPane.add(labelPane, BorderLayout.WEST); - containerSPane.add(searchPane, BorderLayout.EAST); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":", SwingConstants.LEFT); + JPanel containerSPane = row( + cell(formulaLabel).weight(4), + cell(searchPane).weight(1) + ).getComponent(); initKeyWordTextFieldKeyListener(); tipsList = new JList(listModel); tipsList.addMouseListener(new DoubleClick()); - searchButton.addActionListener(e -> { - String toFind = keyWordTextField.getText(); - search(toFind, false); - popTips(); - formulaTextArea.requestFocusInWindow(); - if (tipsList.getSelectedValue() != null) { - fixFunctionNameList(tipsList.getSelectedValue().toString()); - } - }); + + return containerSPane; } protected void initComponents() { - this.setLayout(new BorderLayout(4, 4)); + this.setLayout(new BorderLayout()); - initTextPane(); - initTipsPane(); - initVariableTreeAndDescriptionArea(); + JPanel textPane = initTextPane(); + JPanel tipsPane = initTipsPane(); + JPanel variablePane = initVariableTreeAndDescriptionArea(); + + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(tipsPane), + cell(textPane).weight(1), + cell(variablePane).weight(2) + ).getComponent()); refocusInWindow(); } @@ -304,37 +302,32 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { SwingUtilities.invokeLater(() -> formulaTextArea.requestFocusInWindow()); } - private void initVariableTreeAndDescriptionArea() { + private JPanel initVariableTreeAndDescriptionArea() { variableTreeAndDescriptionArea = new VariableTreeAndDescriptionArea(); - this.add(variableTreeAndDescriptionArea, BorderLayout.SOUTH); + return variableTreeAndDescriptionArea; } - private void initTextPane() { + private JPanel initTextPane() { + JPanel textPane = new JPanel(new BorderLayout(0, LayoutConstants.VERTICAL_GAP)); + JPanel checkBoxAndButtonPane = new JPanel(new BorderLayout()); + // text - JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(textPane, BorderLayout.CENTER); - JPanel checkBoxandbuttonPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); initFormulaTextArea(); - UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea); - formulaTextAreaScrollPane.setBorder(null); - textPane.add(formulaTextAreaScrollPane, BorderLayout.CENTER); - textPane.add(checkBoxandbuttonPane, BorderLayout.SOUTH); - + formulaTextArea.setBorder(null); + formulaTextAreaScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); + // buttonPane + JPanel buttonPane = row(8).getComponent(); UIButton checkValidButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Check_Valid")); UIButton calButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Button")); checkValidButton.addActionListener(checkValidActionListener); calButton.addActionListener(calculateActionListener); + buttonPane.add(checkValidButton); + buttonPane.add(calButton); - //靠左流式布局 - JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - checkBoxandbuttonPane.add(checkBoxPane, BorderLayout.WEST); - //靠右流式布局 - JPanel buttonPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - buttonPane.add(checkValidButton, BorderLayout.EAST); - buttonPane.add(calButton, BorderLayout.EAST); - checkBoxandbuttonPane.add(buttonPane, BorderLayout.EAST); + // checkBoxPane + JPanel checkBoxPane = row(8).getComponent(); if (autoCompletionCheck == null) { autoCompletionCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_AutoCompletion")); autoCompletionCheck.setSelected(true); @@ -343,10 +336,16 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { checkBeforeColse = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Before_Closed")); checkBeforeColse.setSelected(true); } - checkBoxPane.add(autoCompletionCheck, BorderLayout.WEST); - checkBoxPane.add(checkBeforeColse, BorderLayout.WEST); + checkBoxPane.add(autoCompletionCheck); + checkBoxPane.add(checkBeforeColse); extendCheckBoxPane(checkBoxPane); + // layout + checkBoxAndButtonPane.add(checkBoxPane, BorderLayout.WEST); + checkBoxAndButtonPane.add(buttonPane, BorderLayout.EAST); + textPane.add(formulaTextAreaScrollPane, BorderLayout.CENTER); + textPane.add(checkBoxAndButtonPane, BorderLayout.SOUTH); + ParameterTableModel model = new ParameterTableModel(0); editor4CalPane = new UITableEditorPane<>(model); formulaTextArea.addFocusListener(new FocusListener() { @@ -364,6 +363,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { uninstallAutoCompletion(); } }); + return textPane; } private CompletionProvider createCompletionProvider() { @@ -371,7 +371,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { completionProvider = new DefaultCompletionProvider(); NameAndDescription[] nameAndDescriptions = FunctionConstants.ALL.getDescriptions(); for (NameAndDescription nameAndDescription : nameAndDescriptions) { - completionProvider.addCompletion(new FormulaCompletion(completionProvider, nameAndDescription.getName(), BaseUtils.readIcon(FORMULA_ICON))); + completionProvider.addCompletion(new FormulaCompletion(completionProvider, nameAndDescription.getName(), new LazyIcon("formula"))); } VariableResolver variableResolver = VariableResolver.DEFAULT; @@ -395,7 +395,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { paramWithoutPre = parameter; PARAM_PREFIX_MAP.put(paramWithoutPre, StringUtils.EMPTY); } - completionProvider.addCompletion(new FormulaCompletion(completionProvider, paramWithoutPre, BaseUtils.readIcon(PARAM_ICON))); + completionProvider.addCompletion(new FormulaCompletion(completionProvider, paramWithoutPre, new LazyIcon("param"))); } return completionProvider; @@ -646,9 +646,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { popupMenu = new JPopupMenu(); JScrollPane tipsScrollPane = new JScrollPane(tipsList); popupMenu.add(tipsScrollPane); - tipsScrollPane.setPreferredSize(new Dimension(240, 146)); - tipsScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); - popupMenu.show(keyWordTextField, 0, 23); + popupMenu.setBorder(FineBorderFactory.createWrappedRoundBorder()); + tipsScrollPane.setPreferredSize(FineUIScale.scale(new Dimension(172, 120))); + popupMenu.show(searchPane, 0, 28); } protected void search(String keyWord, boolean findDescription) { @@ -743,9 +743,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { } public BasicDialog showLargeWindow(Window window, DialogActionListener l) { - Dimension dimension = DesignSizeI18nManager.getInstance().i18nDimension(this.getClass().getName()); + Dimension dimension = new Dimension(900, 640); BasicDialog basicDialog = super.showWindowWithCustomSize(window, l, dimension); - basicDialog.setMinimumSize(new Dimension(900, 600)); + basicDialog.setMinimumSize(dimension); basicDialog.setResizable(true); return basicDialog; } @@ -1068,15 +1068,15 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { this.initComponents(); } - private void initFunctionTypeList(JPanel functionPane) { + private JPanel initFunctionTypeList() { functionTypeList = new QuickList(functionTypeListModel); UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList); - functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); - functionTypeScrollPane.setPreferredSize(new Dimension(140, 200)); - functionPane.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Category") + ":", functionTypeScrollPane), BorderLayout.WEST); + functionTypeScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); + functionTypeList.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); initTypeListCellRenderer(); initGroupTypeModel(); initTypeListSelectionListener(); + return this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Category"), functionTypeScrollPane); } private void initTypeListCellRenderer() { @@ -1183,24 +1183,23 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { }); } - private void initFunctionNameList(JPanel functionPane) { + private JPanel initFunctionNameList() { functionNameList = new JList(new DefaultListModel()); UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList); - functionNameScrollPane.setPreferredSize(new Dimension(140, 200)); - functionPane.add( - this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Name") + ":", functionNameScrollPane), - BorderLayout.CENTER); - functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); + functionNameScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); + functionNameList.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); initFunctionNameListCellRenderer(); initFunctionNameListSelectionListener(); initFunctionNameListMouseListener(); + return this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Name"), functionNameScrollPane); } private void initDescriptionTextArea() { // Description - descriptionTextArea = new UITextArea(DESCRIPTION_TEXT_AREA_ROW, DESCRIPTION_TEXT_AREA_COLUMN); - descriptionTextArea.setBackground(Color.white); + descriptionTextArea = new UITextArea(); + descriptionTextArea.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); descriptionTextArea.setLineWrap(true); + descriptionTextArea.setBorder(new ScaledEmptyBorder(4, 4, 4, 4)); descriptionTextArea.setWrapStyleWord(true); descriptionTextArea.setEditable(false); descriptionTextArea.addMouseListener(new MouseAdapter() { @@ -1265,14 +1264,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { } - private void initVariablesTree() { - JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - // vairable. + private JPanel initVariablesTree() { + // variable variablesTree = new JTree(); UIScrollPane variablesTreePane = new UIScrollPane(variablesTree); - variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); - panel.add(this.createNamePane( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.WEST); + variablesTreePane.setBorder(FineBorderFactory.createWrappedRoundBorder()); + variablesTree.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); variablesTree.setRootVisible(false); variablesTree.setShowsRootHandles(true); variablesTree.addMouseListener(applyTextMouseListener); @@ -1281,24 +1278,35 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { initDescriptionTextArea(); UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea); - desScrollPane.setBorder(null); - panel.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.CENTER); + desScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); initVariablesTreeSelectionListener(); - this.add(panel, BorderLayout.CENTER); + return Layouts.row(LayoutConstants.HORIZONTAL_GAP, + cell(this.createNamePane( + Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables"), variablesTreePane) + ).weight(1), + cell(this.createNamePane( + Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description"), desScrollPane) + ).weight(1) + ).getComponent(); } private void initComponents() { - this.setLayout(new BorderLayout(4, 4)); - initVariablesTree(); - initFunctionPane(); - } - - private void initFunctionPane() { - JPanel functionPane = new JPanel(new BorderLayout(4, 4)); - this.add(functionPane, BorderLayout.WEST); - initFunctionTypeList(functionPane); - initFunctionNameList(functionPane); + this.setLayout(new BorderLayout()); + JPanel variablesTreePane = initVariablesTree(); + JPanel functionPane = initFunctionPane(); + this.add(Layouts.row(LayoutConstants.HORIZONTAL_GAP, + cell(functionPane).weight(1), + cell(variablesTreePane).weight(2) + ).getComponent()); + } + + private JPanel initFunctionPane() { + JPanel functionTypePane = initFunctionTypeList(); + JPanel functionNamePane = initFunctionNameList(); functionTypeList.setSelectedIndex(0); + return Layouts.row(LayoutConstants.HORIZONTAL_GAP, + cell(functionTypePane).weight(1), cell(functionNamePane).weight(1) + ).getComponent(); } @Override @@ -1314,7 +1322,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { public LookDetailAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Function_Detail")); this.setMnemonic('L'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png")); + this.setSmallIcon(new LazyIcon("preview")); } // 弹出的窗口中显示函数的用法明细 @@ -1347,8 +1355,10 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { } private JPanel createNamePane(String name, JComponent comp) { - JPanel namePane = new JPanel(new BorderLayout(4, 4)); - namePane.add(new UILabel(name), BorderLayout.NORTH); + JPanel namePane = new JPanel(new BorderLayout(0, 4)); + UILabel label = new UILabel(name); + FineUIStyle.setStyle(label, FineUIStyle.LABEL_BOLD); + namePane.add(label, BorderLayout.NORTH); namePane.add(comp, BorderLayout.CENTER); return namePane; } @@ -1421,26 +1431,26 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { DefaultMutableTreeNode bindCellNode = new DefaultMutableTreeNode(new TextUserObject("$$$")); rootNode.add(bindCellNode); } - + // 数据项 rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Data_Fields"), - BaseUtils.readIcon("/com/fr/design/images/dialog/table.png"), + new LazyIcon("dataItem"), variableResolver.resolveColumnNames()).createMutableTreeNode()); // Set cutReport Variable rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables"), - BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"), + new LazyIcon("variable"), variableResolver.resolveCurReportVariables()).createMutableTreeNode()); - + // 数据集参数 rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Tabledata"), - BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), + new LazyIcon("param_global"), variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode()); - + // 报表参数 rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ParameterD_Report_Parameter"), - BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"), + new LazyIcon("param"), variableResolver.resolveReportParameterVariables()).createMutableTreeNode()); - + // 全局参数 rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Server_Global_Parameters"), - BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), + new LazyIcon("param_global"), variableResolver.resolveGlobalParameterVariables()).createMutableTreeNode()); variableModel.reload(); diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java index ab49b605d4..901ea88976 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java +++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java @@ -40,8 +40,8 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Save_Formula")); reserveCheckBox4Write.setSelected(false); - checkBoxPane.add(reserveCheckBox4Result, BorderLayout.WEST); - checkBoxPane.add(reserveCheckBox4Write, BorderLayout.WEST); + checkBoxPane.add(reserveCheckBox4Result); + checkBoxPane.add(reserveCheckBox4Write); } @Override diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java index c40a917e39..f1e15bf4a1 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java @@ -1,5 +1,6 @@ package com.fr.design.formula; +import com.fine.theme.icon.LazyIcon; import com.fr.design.beans.BasicBeanPane; import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane; import com.fr.design.dialog.BasicDialog; @@ -14,7 +15,6 @@ import com.fr.design.gui.itextarea.DescriptionTextArea; import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.file.FunctionConfig; import com.fr.general.NameObject; @@ -23,14 +23,23 @@ import com.fr.stable.project.ProjectConstants; import com.fr.stable.script.FunctionDef; import com.fr.workspace.WorkContext; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.BorderFactory; +import javax.swing.SwingUtilities; +import javax.swing.JScrollPane; +import java.awt.BorderLayout; +import java.awt.Dialog; +import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + public class FunctionManagerPane extends BasicPane { private FunctionControlPane functionControlPane; @@ -94,8 +103,8 @@ public class FunctionManagerPane extends BasicPane { @Override public NameableCreator[] createNameableCreators() { - NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function"), FunctionDef.class, - FunctionContentPane.class); + NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function"), + new LazyIcon("page_query"), FunctionDef.class, FunctionContentPane.class); return new NameableCreator[]{funcDef}; } @@ -119,15 +128,10 @@ public class FunctionManagerPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0)); JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); - this.add(northPane, BorderLayout.NORTH); - JPanel reportletNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - classNameTextField = new UITextField(25); - reportletNamePane.add(classNameTextField); + JPanel reportletNamePane = new JPanel(new BorderLayout()); + classNameTextField = new UITextField(); UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")); - browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); - reportletNamePane.add(browserButton); - browserButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent evt) { + browserButton.addActionListener(evt -> { final ClassNameSelectPane bPane = new ClassNameSelectPane(); bPane.setClassPath(classNameTextField.getText()); bPane.showWindow( (Dialog) SwingUtilities.getWindowAncestor(FunctionContentPane.this), @@ -136,31 +140,46 @@ public class FunctionManagerPane extends BasicPane { classNameTextField.setText(bPane.getClassPath()); } }).setVisible(true); - } - }); + }); UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); - editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); - reportletNamePane.add(editorButton); editorButton.addActionListener(createEditorButtonActionListener()); - JPanel classNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - classNamePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), BorderLayout.NORTH); - classNamePane.add(reportletNamePane, BorderLayout.CENTER); - northPane.add(classNamePane); + + reportletNamePane.add(row(10, + cell(classNameTextField).weight(0.7), + cell(browserButton).weight(0.15), + cell(editorButton).weight(0.15) + ).getComponent()); + JPanel classNamePane = new JPanel(new BorderLayout()); + classNamePane.add(column(10, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name"))), + cell(reportletNamePane) + ).getComponent()); DescriptionTextArea descriptionArea = new DescriptionTextArea(); descriptionArea.setWrapStyleWord(true); descriptionArea.setLineWrap(true); - northPane.add(descriptionArea); + descriptionArea.setForeground(Color.GRAY); + descriptionArea.setBorder(null); + + northPane.add(column(10, + cell(classNamePane), + cell(descriptionArea) + ).getComponent()); String path1 = getEscapePath(File.separator + ProjectConstants.WEBINF_NAME + File.separator + ProjectConstants.CLASSES_NAME); String path2 = getEscapePath(WorkContext.getCurrent().getPath() + File.separator + ProjectConstants.CLASSES_NAME); descriptionArea.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Description_Area_Text", path1, path2)); - JPanel descriptionPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); //Description Pane - this.add(descriptionPane, BorderLayout.SOUTH); - descriptionPane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); - descriptionPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Description") + ":"), BorderLayout.NORTH); - this.descriptionTextArea = new UITextArea(6, 24); - descriptionPane.add(new JScrollPane(this.descriptionTextArea), BorderLayout.CENTER); + JPanel descriptionPane = new JPanel(new BorderLayout()); //Description Pane + this.descriptionTextArea = new UITextArea(); + descriptionPane.add(column(10, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Description"))), + cell(new JScrollPane(this.descriptionTextArea)).weight(0.9) + ).getComponent()); + this.add(column(10, + cell(northPane).weight(0.35), + cell(descriptionPane).weight(0.65) + ).getComponent()); + } private String getEscapePath(String path) { diff --git a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java index e5594ddd11..8422a27dc6 100644 --- a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java @@ -1,31 +1,31 @@ package com.fr.design.formula; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseFormula; -import com.fr.base.BaseUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.DesignerContext; -import javax.swing.BorderFactory; -import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Cursor; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** - * + * * @author zhou * @since 2012-6-1下午3:50:37 */ public class TinyFormulaPane extends BasicBeanPane implements UIObserver{ - + private static final long serialVersionUID = 1L; protected UITextField formulaTextField; protected UIButton formulaTextFieldButton; @@ -40,9 +40,8 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand")); // 添加一公式编辑器按钮 - formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); + formulaTextFieldButton = new UIButton(new LazyIcon("formula")); formulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + "..."); - formulaTextFieldButton.setPreferredSize(new Dimension(24, 20)); formulaTextFieldButton.setOpaque(false); formulaTextFieldButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); formulaTextFieldButton.addActionListener(new ActionListener() { @@ -73,30 +72,27 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver } protected void initLayout() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - JPanel pane = new JPanel(new BorderLayout(0,0)); - JPanel pane1 = new JPanel(new BorderLayout(0,0)); - pane1.add(formulaTextField, BorderLayout.NORTH); - pane1.setBorder(BorderFactory.createEmptyBorder(0,0,0,5)); - pane.add(pane1,BorderLayout.CENTER); - pane.add(formulaTextFieldButton,BorderLayout.EAST); - this.setLayout(new BorderLayout()); - this.add(pane,BorderLayout.NORTH) ; + this.add(row(4, + cell(formulaTextField).weight(2.4), cell(formulaTextFieldButton).weight(0.5) + ).getComponent()) ; } - + /** * 公式窗口点击确定后的事件接口 */ public void okEvent() { - + } - + public UITextField getUITextField() { return formulaTextField; } + public UIButton getFormulaTextFieldButton() { + return formulaTextFieldButton; + } + @Override public void populateBean(String ob) { this.formulaTextField.setText(ob); @@ -112,11 +108,6 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present"); } - @Override - public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, 20); - } - @Override public void registerChangeListener(UIObserverListener listener) { if(formulaTextField != null) { diff --git a/designer-base/src/main/java/com/fr/design/fun/MultiTemplateTabPaneHandler.java b/designer-base/src/main/java/com/fr/design/fun/MultiTemplateTabPaneHandler.java new file mode 100644 index 0000000000..c431cadaf3 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/fun/MultiTemplateTabPaneHandler.java @@ -0,0 +1,47 @@ +package com.fr.design.fun; + +import com.fr.design.menu.ShortCut; +import com.fr.stable.fun.mark.Mutable; + +/** + * 设计器 Multi_template 按钮插件接口 + * + * @author lemon + * @since + * Created on + */ +public interface MultiTemplateTabPaneHandler extends Mutable { + + String MARK_STRING = "MultiTemplateTabPaneHandler"; + + int CURRENT_LEVEL = 1; + + + int LAST = -1; + int HIDE =-2; + + String LEADING_LOCATION = "leading_location"; + String TRAILING_LOCATION = "trailing_location"; + + /** + * 插入工具按钮的位置 + * + * @param total 插入的位置 + * @return 插入位置，如果想放到最后，则返回-1 + */ + int insertPosition(int total); + + /** + * 所属的工具按钮分类 + * + * @return 分类工具按钮名 + */ + String category(); + + /** + * 具体的工具按钮项内容 + * + * @return 工具按钮项内容 + */ + ShortCut shortcut(); +} diff --git a/designer-base/src/main/java/com/fr/design/fun/PreviewProvider.java b/designer-base/src/main/java/com/fr/design/fun/PreviewProvider.java index 76b5037ef5..e62df8b59b 100644 --- a/designer-base/src/main/java/com/fr/design/fun/PreviewProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/PreviewProvider.java @@ -38,6 +38,14 @@ public interface PreviewProvider extends Mutable, Filter { */ String iconPathForLarge(); + /** + * 下拉弹出菜单的图标Id + * @return 图标Id + */ + default String iconIdForPopupItem() { + return StringUtils.EMPTY; + } + /** * 点击下拉菜单时触发的事件 * @param jt 当前的模板对象 diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractHyperlinkProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractHyperlinkProvider.java index 9c74795d8e..57e31c52f8 100644 --- a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractHyperlinkProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractHyperlinkProvider.java @@ -1,5 +1,6 @@ package com.fr.design.fun.impl; +import com.fr.base.svg.IconUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.fun.HyperlinkProvider; import com.fr.design.gui.controlpane.NameObjectCreator; @@ -25,7 +26,7 @@ public abstract class AbstractHyperlinkProvider extends AbstractProvider impleme @Override public NameableCreator createHyperlinkCreator() { - return new NameObjectCreator(text(), target(), appearance()); + return new NameObjectCreator(text(), IconUtils.readIcon("com/fr/design/images/data/hyperlink.svg"), target(), appearance()); } @Override diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiTemplateTabPaneHandler.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiTemplateTabPaneHandler.java new file mode 100644 index 0000000000..c13a2af584 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiTemplateTabPaneHandler.java @@ -0,0 +1,38 @@ +package com.fr.design.fun.impl; + +import com.fr.design.fun.MultiTemplateTabPaneHandler; +import com.fr.design.menu.ShortCut; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; + +/** + * 多模板工具按钮插件适配抽象类 + * + * @author lemon + * @since + * Created on + */ +@API(level = MultiTemplateTabPaneHandler.CURRENT_LEVEL) +public abstract class AbstractMultiTemplateTabPaneHandler extends AbstractProvider implements MultiTemplateTabPaneHandler { + /** + * 当前接口的API等级,用于判断是否需要升级插件 + * @return API等级 + */ + public int currentAPILevel() { + return CURRENT_LEVEL; + } + + @Override + public String mark4Provider() { + return this.getClass().getName(); + } + + /** + * 获取当前工具按钮对应的Action + * + * @return 工具按钮 Action + */ + public ShortCut shortcut() { + return null; + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java b/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java index c33f3e0fc2..f359b31730 100644 --- a/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java +++ b/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java @@ -7,27 +7,30 @@ import com.fr.design.gui.borders.UITableHeaderBorder; import com.fr.design.gui.borders.UITableHeaderRolloverBorder; import com.fr.design.gui.borders.UITextFieldBorder; import com.fr.design.gui.frpane.UIBasicOptionPaneUI; -import com.fr.design.gui.ibutton.UIBasicButtonUI; +import com.fr.design.gui.frpane.UITabbedPaneUI; import com.fr.design.gui.ibutton.UIButtonBorder; +import com.fr.design.gui.ibutton.UIButtonUI; import com.fr.design.gui.ibutton.UIRadioButtonMenuItemUI; import com.fr.design.gui.ibutton.UIRadioButtonUI; import com.fr.design.gui.icheckbox.UICheckBoxUI; -import com.fr.design.gui.icombobox.UIBasicComboBoxUI; +import com.fr.design.gui.icombobox.UIComboBoxUI; import com.fr.design.gui.icontainer.UIScrollPaneBorder; import com.fr.design.gui.icontainer.UIScrollPaneUI; import com.fr.design.gui.icontainer.UITableScrollPaneBorder; -import com.fr.design.gui.imenu.UIBasicMenuItemUI; import com.fr.design.gui.imenu.UIBasicMenuUI; +import com.fr.design.gui.imenu.UIMenuBarUI; +import com.fr.design.gui.imenu.UIMenuItemUI; import com.fr.design.gui.imenu.UIPopupMenuBorder; import com.fr.design.gui.imenu.UIPopupMenuSeparatorUI; import com.fr.design.gui.iprogressbar.UIProgressBarBorder; import com.fr.design.gui.iprogressbar.UIProgressBarUI; -import com.fr.design.gui.iscrollbar.UIBasicScrollBarUI; +import com.fr.design.gui.iscrollbar.UIScrollBarUI; import com.fr.design.gui.ispinner.UISpinnerUI; import com.fr.design.gui.isplitpanedivider.UISplitPaneUI; import com.fr.design.gui.itable.UIBasicTableUI; import com.fr.design.gui.itoolbar.UIToolBarBorder; import com.fr.design.gui.itoolbar.UIToolBarSeparatorUI; +import com.fr.design.gui.itoolbar.UIToolBarUI; import com.fr.design.gui.itooltip.UIToolTipBorder; import com.fr.design.gui.itree.UITreeUI; import com.fr.design.i18n.Toolkit; @@ -89,16 +92,20 @@ public class UILookAndFeel extends MetalLookAndFeel { "RadioButtonUI", UIRadioButtonUI.class.getName(), "CheckBoxUI", UICheckBoxUI.class.getName(), "ToolBarSeparatorUI", UIToolBarSeparatorUI.class.getName(), - "ScrollBarUI", UIBasicScrollBarUI.class.getName(), - "ComboBoxUI", UIBasicComboBoxUI.class.getName(), - "ButtonUI", UIBasicButtonUI.class.getName(), - "ToggleButtonUI", UIBasicButtonUI.class.getName(), + "ScrollBarUI", UIScrollBarUI.class.getName(), + "ComboBoxUI", UIComboBoxUI.class.getName(), + "ButtonUI", UIButtonUI.class.getName(), + "ToggleButtonUI", UIButtonUI.class.getName(), "TableUI", UIBasicTableUI.class.getName(), "ProgressBarUI", UIProgressBarUI.class.getName(), "MenuUI", UIBasicMenuUI.class.getName(), - "MenuItemUI", UIBasicMenuItemUI.class.getName(), + "MenuItemUI", UIMenuItemUI.class.getName(), "RadioButtonMenuItemUI", UIRadioButtonMenuItemUI.class.getName(), "OptionPaneUI", UIBasicOptionPaneUI.class.getName(), + "ToolBarUI", UIToolBarUI.class.getName(), + "MenuBarUI", UIMenuBarUI.class.getName(), +// "PopupMenuUI", PopupMenuUI.class.getName(), + "TabbedPaneUI", UITabbedPaneUI.class.getName(), }); } @@ -219,5 +226,8 @@ public class UILookAndFeel extends MetalLookAndFeel { return new ImageIcon(url); } - + @Override + public String getName() { + return "FR UI 10"; + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowPane.java b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowPane.java index 10ea21a9ae..d23a1fd22f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowPane.java @@ -1,6 +1,6 @@ package com.fr.design.gui.columnrow; -import com.fr.design.designer.IntervalConstants; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ispinner.ColumnRowSpinner; @@ -15,8 +15,8 @@ import com.fr.stable.StringUtils; import javax.swing.JFormattedTextField; import javax.swing.JPanel; -import javax.swing.JSpinner.DefaultEditor; import javax.swing.SpinnerListModel; +import javax.swing.JSpinner.DefaultEditor; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; @@ -27,7 +27,10 @@ import javax.swing.text.BadLocationException; import javax.swing.text.DocumentFilter; import java.awt.BorderLayout; import java.awt.Dimension; -import java.awt.GridLayout; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; /** * the component to edit ColumnRow @@ -96,11 +99,16 @@ public class ColumnRowPane extends JPanel implements UIObserver { * 初始化元素 */ public void initComponents() { - this.setLayout(new GridLayout(0, 2, IntervalConstants.INTERVAL_L6, 0)); + this.setLayout(new BorderLayout()); initColSpinner(); - this.add(columnSpinner, BorderLayout.WEST); initRowSpinner(); - this.add(rowSpinner); + this.add( + row( + cell(columnSpinner).weight(1), + fix(2), + cell(rowSpinner).weight(1) + ).getComponent() + ); this.addDocumentListener(d); } @@ -126,7 +134,7 @@ public class ColumnRowPane extends JPanel implements UIObserver { } }; - rowSpinner.setPreferredSize(new Dimension(60, 24)); + rowSpinner.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal")); JFormattedTextField rftf = GUICoreUtils.getSpinnerTextField(rowSpinner); if (rftf != null) { rftf.setColumns(4); // specify more width than we need @@ -141,7 +149,7 @@ public class ColumnRowPane extends JPanel implements UIObserver { return false; } }; - columnSpinner.setPreferredSize(new Dimension(60, 24)); + columnSpinner.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal")); JFormattedTextField cftf = GUICoreUtils.getSpinnerTextField(columnSpinner); if (cftf != null) { cftf.setColumns(3); // specify more width than we need diff --git a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java index a269359b73..4e19650e73 100644 --- a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java @@ -7,7 +7,10 @@ import javax.swing.JPanel; import com.fr.design.layout.FRGUIPaneFactory; - +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; /** * @author kunsnat E-mail:kunsnat@gmail.com @@ -21,22 +24,20 @@ public class ColumnRowVerticalPane extends ColumnRowPane { public ColumnRowVerticalPane( ) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - JPanel pane = FRGUIPaneFactory.createYBoxEmptyBorderPane(); + JPanel pane = new JPanel(FRGUIPaneFactory.createBorderLayout()); this.add(pane, BorderLayout.NORTH); - JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column") + ":")); - pane.add(colPane); - + UILabel colLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column")); + initColSpinner(); - colPane.add(columnSpinner); - - JPanel rowPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - pane.add(rowPane); - - rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") + ":")); + + UILabel rowLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")); initRowSpinner(); - rowPane.add(rowSpinner); + + pane.add(column(10, + row(cell(rowLabel).weight(0.15), cell(rowSpinner).weight(0.85)), + row(cell(colLabel).weight(0.15), cell(columnSpinner).weight(0.85)) + ).getComponent()); this.addDocumentListener(d); } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/AbstractNameableCreator.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/AbstractNameableCreator.java index 9ad08a9e63..c7a46b03f8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/AbstractNameableCreator.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/AbstractNameableCreator.java @@ -1,13 +1,12 @@ package com.fr.design.gui.controlpane; -import com.fr.base.BaseUtils; import com.fr.base.svg.IconUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; import com.fr.js.JavaScript; -import javax.swing.*; +import javax.swing.Icon; public abstract class AbstractNameableCreator implements NameableCreator { @@ -24,13 +23,28 @@ public abstract class AbstractNameableCreator implements NameableCreator { this.clazzOfEditor = clazzOfEditor; } + /** + * 改用 {@link AbstractNameableCreator#AbstractNameableCreator(String, Icon, Class)} + */ + @Deprecated public AbstractNameableCreator(String menuName, String iconPath, Class clazz) { this.menuName = menuName; this.menuIcon = IconUtils.readIcon(iconPath); this.clazzOfObject = clazz; this.clazzOfInitCase = clazz; } - + + public AbstractNameableCreator(String menuName, Icon icon, Class clazz) { + this.menuName = menuName; + this.menuIcon = icon; + this.clazzOfObject = clazz; + this.clazzOfInitCase = clazz; + } + + /** + * 改用{@link AbstractNameableCreator#AbstractNameableCreator(String, Icon, Class, Class)} + */ + @Deprecated public AbstractNameableCreator(String menuName, String iconPath, Class clazz, Class clazzOfEditor) { this.menuName = menuName; this.menuIcon = IconUtils.readIcon(iconPath); @@ -38,7 +52,19 @@ public abstract class AbstractNameableCreator implements NameableCreator { this.clazzOfEditor = clazzOfEditor; this.clazzOfInitCase = clazz; } - + + public AbstractNameableCreator(String menuName, Icon icon, Class clazz, Class clazzOfEditor) { + this.menuName = menuName; + this.menuIcon = icon; + this.clazzOfObject = clazz; + this.clazzOfEditor = clazzOfEditor; + this.clazzOfInitCase = clazz; + } + + /** + * 改用{@link AbstractNameableCreator#AbstractNameableCreator(String, Icon, Class, Class, Class)} + */ + @Deprecated public AbstractNameableCreator(String menuName, String iconPath, Class clazz, Class clazz4Init, Class clazzOfEditor) { this.menuName = menuName; this.menuIcon = IconUtils.readIcon(iconPath); @@ -48,6 +74,15 @@ public abstract class AbstractNameableCreator implements NameableCreator { this.clazzOfInitCase = clazz4Init; } + public AbstractNameableCreator(String menuName, Icon icon, Class clazz, Class clazz4Init, Class clazzOfEditor) { + this.menuName = menuName; + this.menuIcon = icon; + this.clazzOfObject = clazz; + this.clazzOfEditor = clazzOfEditor; + this.clazzOfInitCase = clazz; + this.clazzOfInitCase = clazz4Init; + } + /** * get menuName * @return diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java index 37fef509db..b957a1370d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java @@ -1,5 +1,9 @@ package com.fr.design.gui.controlpane; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.border.FineBorderFactory; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.controlpane.shortcutfactory.AbstractShortCutFactory; import com.fr.design.gui.controlpane.shortcutfactory.OldShortCutFactory; @@ -7,7 +11,6 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.ToolBarDef; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.ArrayUtils; import com.fr.stable.Filter; import com.fr.stable.Nameable; @@ -17,6 +20,7 @@ import javax.swing.JPanel; import javax.swing.JSplitPane; import java.awt.BorderLayout; import java.awt.CardLayout; +import java.awt.Color; import java.util.Arrays; import java.util.stream.Stream; @@ -26,7 +30,7 @@ import java.util.stream.Stream; * Time: 15:07 */ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, ShortCutListenerProvider { - private static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30 + private static final int SHORT_WIDTH = FineUIScale.scale(30); //每加一个short Divider位置加30 private static final String SELECT = "SELECT"; private static final String EDIT = "EDIT"; JPanel controlUpdatePane; @@ -107,7 +111,6 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S initCardPane(); // SplitPane JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, getLeftPane(), cardPane); - mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); mainSplitPane.setOneTouchExpandable(true); this.add(mainSplitPane, BorderLayout.CENTER); @@ -148,6 +151,11 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S toolbarDef.addShortCut(sj.getShortCut()); } toolBar = ToolBarDef.createJToolBar(); + toolBar.setBorder(BorderFactory.createCompoundBorder( + FineBorderFactory.createUnderlineBorder(FlatUIUtils.getUIColor("defaultBorderColor", Color.GRAY)), + new ScaledEmptyBorder(3, 0, 3, 0) + )); + toolBar.setBorderPainted(true); toolbarDef.updateToolBar(toolBar); } @@ -163,7 +171,6 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S } initToolBar(); - leftPane.add(toolBar, BorderLayout.NORTH); return leftPane; } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java index dfece2e133..5b6bc8cdea 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java @@ -1,6 +1,11 @@ package com.fr.design.gui.controlpane; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.border.FineBorderFactory; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilist.JNameEdList; @@ -10,14 +15,12 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.event.Listener; import com.fr.general.ComparatorUtils; -import com.fr.general.IOUtils; import com.fr.invoke.Reflect; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; -import javax.swing.BorderFactory; import javax.swing.DefaultListModel; import javax.swing.Icon; import javax.swing.JLabel; @@ -32,6 +35,7 @@ import javax.swing.event.ListSelectionListener; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; +import java.awt.Dimension; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -87,8 +91,9 @@ public abstract class JListControlPane extends JControlPane implements ListContr protected void initLeftPane(JPanel leftPane) { nameableList = createJNameList(); nameableList.setName(LIST_NAME); + nameableList.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); leftPane.add(new UIScrollPane(nameableList), BorderLayout.CENTER); - + leftPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); nameableList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); nameableList.addMouseListener(listMouseListener); nameableList.addListSelectionListener(new ListSelectionListener() { @@ -107,6 +112,12 @@ public abstract class JListControlPane extends JControlPane implements ListContr }); } + @Override + protected void initToolBar() { + super.initToolBar(); + toolBar.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + } + protected JNameEdList createJNameList() { JNameEdList nameEdList = new JNameEdList(new DefaultListModel()) { @Override @@ -355,16 +366,15 @@ public abstract class JListControlPane extends JControlPane implements ListContr /** * JList默认单元格渲染器的选中背景色 */ - private final Color selectedBgColor = new Color(65, 155, 249); protected NameableListCellRenderer() { setLayout(new BorderLayout()); this.textLabel = new JLabel(); this.iconLabel = new JLabel(); - this.textLabel.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 1)); - this.iconLabel.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 0)); + this.textLabel.setBorder(new ScaledEmptyBorder(0, 4, 0, 0)); + this.iconLabel.setBorder(new ScaledEmptyBorder(0, 4, 0, 0)); add(this.textLabel, BorderLayout.CENTER); add(this.iconLabel, BorderLayout.WEST); - this.iconLabel.setBackground(Color.WHITE); + this.iconLabel.setBackground(FlatUIUtils.getUIColor("List.cellRender.background", Color.WHITE)); //iconLabel和textLabel的背景颜色不会被JList背景颜色覆盖,开发者自定义 this.textLabel.setOpaque(true); this.iconLabel.setOpaque(true); @@ -373,18 +383,16 @@ public abstract class JListControlPane extends JControlPane implements ListContr @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - + setPreferredSize(FineUIScale.scale(new Dimension(list.getWidth(), 24))); if (value instanceof ListModelElement) { ListModelElement element = ((ListModelElement) value); Nameable nameable = element.wrapper; this.textLabel.setText(nameable.getName()); boolean iconSet = false; if(isSelected) { - this.textLabel.setBackground(selectedBgColor); - this.textLabel.setForeground(Color.WHITE); + this.textLabel.setBackground(FlatUIUtils.getUIColor("List.selectionInactiveBackground", Color.GRAY)); } else { - this.textLabel.setBackground(Color.WHITE); - this.textLabel.setForeground(Color.BLACK); + this.textLabel.setBackground(FlatUIUtils.getUIColor("List.cellRender.background", Color.WHITE)); } for (NameableCreator creator : JListControlPane.this.creators()) { if (creator.menuIcon() != null && creator.acceptObject2Populate(nameable) != null) { @@ -395,7 +403,7 @@ public abstract class JListControlPane extends JControlPane implements ListContr } } if (!iconSet) { - this.setIcon(IOUtils.readIcon("/com/fr/base/images/oem/cpt.png")); + this.setIcon(new LazyIcon("cpt_icon")); } } return this; diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/NameObjectCreator.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/NameObjectCreator.java index e7697183af..3b5f1efed3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/NameObjectCreator.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/NameObjectCreator.java @@ -1,10 +1,12 @@ package com.fr.design.gui.controlpane; -import com.fr.general.NameObject; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ilist.ListModelElement; +import com.fr.general.NameObject; import com.fr.stable.Nameable; +import javax.swing.Icon; + public class NameObjectCreator extends AbstractNameableCreator { @@ -16,18 +18,44 @@ public class NameObjectCreator extends AbstractNameableCreator { super(menuName, clazz, updatePane); } + /** + * 改用{@link NameObjectCreator#NameObjectCreator(String, Icon, Class)} + */ + @Deprecated public NameObjectCreator(String menuName, String iconPath, Class clazz) { super(menuName, iconPath, clazz); } - + + public NameObjectCreator(String menuName, Icon icon, Class clazz) { + super(menuName, icon, clazz); + } + + /** + * 改用{@link NameObjectCreator#NameObjectCreator(String, Icon, Class, Class)} + */ + @Deprecated public NameObjectCreator(String menuName, String iconPath, Class clazz, Class updatePane) { super(menuName, iconPath, clazz, updatePane); } - + + public NameObjectCreator(String menuName, Icon icon, Class clazz, Class updatePane) { + super(menuName, icon, clazz, updatePane); + } + + /** + * 改用{@link NameObjectCreator#NameObjectCreator(String, Icon, Class, Class, Class)} + */ + @Deprecated public NameObjectCreator(String menuName, String iconPath, Class clazz, Class clazz4Init, Class updatePane) { super(menuName, iconPath, clazz, clazz4Init, updatePane); } + public NameObjectCreator(String menuName, Icon icon, Class clazz, Class clazz4Init, Class updatePane) { + super(menuName, icon, clazz, clazz4Init, updatePane); + } + + + /** * create Nameable * @param helper diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/NameableSelfCreator.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/NameableSelfCreator.java index 4b06b74ca4..8543b77500 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/NameableSelfCreator.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/NameableSelfCreator.java @@ -3,16 +3,16 @@ package com.fr.design.gui.controlpane; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ilist.ListModelElement; import com.fr.stable.Nameable; - +import javax.swing.Icon; public abstract class NameableSelfCreator extends AbstractNameableCreator { public NameableSelfCreator(String menuName, Class clazz, Class updatePane) { super(menuName, clazz, updatePane); } - - public NameableSelfCreator(String menuName, String iconPath, Class clazz, Class updatePane) { - super(menuName, iconPath, clazz, updatePane); + + public NameableSelfCreator(String menuName, Icon icon, Class clazz, Class updatePane) { + super(menuName, icon, clazz, updatePane); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java index 12f904922d..814e52848b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java @@ -1,11 +1,15 @@ package com.fr.design.gui.controlpane; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.border.FineBorderFactory; import com.fr.design.constants.UIConstants; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.controlpane.shortcutfactory.ShortCutFactory; import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.itoolbar.UIToolBarUI; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; @@ -30,10 +34,7 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Frame; -import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.GraphicsEnvironment; import java.awt.Point; import java.awt.Rectangle; @@ -46,15 +47,16 @@ import java.awt.event.MouseMotionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineUIScale.scale; + /** * Created by plough on 2017/7/21. */ public abstract class UIControlPane extends JControlPane { private UIToolbar topToolBar; protected Window popupEditDialog; - private static final int TOP_TOOLBAR_HEIGHT = 20; - private static final int TOP_TOOLBAR_WIDTH = 156; // 可能因为用了tablelayout，要比其他地方多一个像素，看起来才正常 - private static final int TOP_TOOLBAR_WIDTH_SHORT = 76; UIControlPane() { super(); @@ -80,18 +82,16 @@ public abstract class UIControlPane extends JControlPane { if (isNewStyle()) { createPopupEditDialog(cardPane); this.add(getLeftPane(), BorderLayout.CENTER); - this.setBorder(BorderFactory.createEmptyBorder(10, 10, 15, 10)); + this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); } else { // 增加边框 JPanel leftPaneWrapper = new JPanel(new BorderLayout()); leftPaneWrapper.add(getLeftPane(), BorderLayout.CENTER); - leftPaneWrapper.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6)); JPanel rightPaneWrapper = new JPanel(new BorderLayout()); rightPaneWrapper.add(cardPane, BorderLayout.CENTER); - rightPaneWrapper.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6)); + rightPaneWrapper.setBorder(new ScaledEmptyBorder(0, 10, 0, 0)); // SplitPane JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, leftPaneWrapper, rightPaneWrapper); - mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); mainSplitPane.setOneTouchExpandable(true); this.add(mainSplitPane, BorderLayout.CENTER); mainSplitPane.setDividerLocation(getLeftPreferredSize()); @@ -111,14 +111,6 @@ public abstract class UIControlPane extends JControlPane { @Override protected void initToolBar() { super.initToolBar(); - toolBar.setUI(new UIToolBarUI() { - @Override - public void paint(Graphics g, JComponent c) { - Graphics2D g2 = (Graphics2D) g; - g2.setColor(Color.WHITE); - g2.fillRect(0, 0, c.getWidth(), c.getHeight()); - } - }); } protected JPanel getLeftPane() { @@ -139,45 +131,31 @@ public abstract class UIControlPane extends JControlPane { // 封装一层，加边框 JPanel toolBarPane = new JPanel(new BorderLayout()); toolBarPane.add(toolBar, BorderLayout.CENTER); - toolBarPane.setBorder(BorderFactory.createMatteBorder(1, 1, 0, 1, UIConstants.RULER_LINE_COLOR)); leftContentPane.add(toolBarPane, BorderLayout.NORTH); // 顶部标签及add按钮 - topToolBar = new UIToolbar(FlowLayout.LEFT, new UIToolBarUI() { - @Override - public void paint(Graphics g, JComponent c) { - Graphics2D g2 = (Graphics2D) g; - g2.setColor(UIConstants.SELECT_TAB); - g2.fillRect(0, 0, c.getWidth(), c.getHeight()); - } - }); - topToolBar.setBorder(null); + topToolBar = new UIToolbar(); topToolBar.setLayout(new BorderLayout()); ShortCut addItem = shortCutFactory.addItemShortCut().getShortCut(); addItem.intoJToolBar(topToolBar); JPanel leftTopPane = getLeftTopPane(topToolBar); - leftTopPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 6, 0)); + leftTopPane.setBorder(new ScaledEmptyBorder(0, 0, 10, 0)); leftPane.add(leftTopPane, BorderLayout.NORTH); return leftPane; } protected JPanel getLeftTopPane(UIToolbar topToolBar) { - UILabel addItemLabel = FRWidgetFactory.createLineWrapLabel(getAddItemText()); - - topToolBar.setPreferredSize( - new Dimension( - isNewStyle() ? TOP_TOOLBAR_WIDTH : TOP_TOOLBAR_WIDTH_SHORT, - TOP_TOOLBAR_HEIGHT - )); - JPanel toolBarPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - toolBarPane.add(topToolBar, BorderLayout.NORTH); - - JPanel leftTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - leftTopPane.add(toolBarPane, BorderLayout.EAST); - leftTopPane.add(addItemLabel, BorderLayout.CENTER); - return leftTopPane; + return row(10, + cell(FRWidgetFactory.createLineWrapLabel(getAddItemText())), + cell(topToolBar).with(it -> { + it.setBorderPainted(true); + it.setPreferredSize(FineUIScale.scale(new Dimension(160, 24))); + it.setBorder(FineBorderFactory.createWrappedRoundBorder()); + it.setBackground(FlatUIUtils.getUIColor("fill.normal", Color.WHITE)); + }).weight(1.0) + ).getComponent(); } /** @@ -188,7 +166,6 @@ public abstract class UIControlPane extends JControlPane { } protected ShortCut4JControlPane[] createShortcuts() { -// return AbstractShortCutFactory.getInstance(this).createNewShortCuts(); return shortCutFactory.createShortCuts(); } @@ -210,17 +187,21 @@ public abstract class UIControlPane extends JControlPane { this.repaint(); } + protected UIToolbar getTopToolBar() { + return this.topToolBar; + } + // 点击"编辑"按钮，弹出面板 protected class PopupEditDialog extends JDialog { private JComponent editPane; private PopupToolPane popupToolPane; private static final int WIDTH = 570; - private static final int HEIGHT = 490; + private static final int HEIGHT = 553; PopupEditDialog(JComponent pane) { super(DesignerContext.getDesignerFrame()); setUndecorated(true); - pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10)); + pane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); this.editPane = pane; JPanel editPaneWrapper = new JPanel(new BorderLayout()); popupToolPane = new PopupToolPane(this); @@ -228,8 +209,7 @@ public abstract class UIControlPane extends JControlPane { editPaneWrapper.add(editPane, BorderLayout.CENTER); editPaneWrapper.setBorder(BorderFactory.createLineBorder(UIConstants.POP_DIALOG_BORDER, 1)); this.getContentPane().add(editPaneWrapper, BorderLayout.CENTER); - setSize(WIDTH, HEIGHT); -// pack(); + setSize(scale(new Dimension(WIDTH, HEIGHT))); this.setVisible(false); initListener(); } @@ -395,8 +375,9 @@ public abstract class UIControlPane extends JControlPane { contentPane.setBackground(originColor); contentPane.setLayout(new BorderLayout()); titleLabel = new UILabel(title); + FineUIStyle.setStyle(titleLabel, FineUIStyle.LABEL_BOLD); contentPane.add(titleLabel, BorderLayout.WEST); - contentPane.setBorder(new EmptyBorder(5, 14, 6, 0)); + contentPane.setBorder(new ScaledEmptyBorder(5, 14, 6, 0)); setLayout(new BorderLayout()); add(contentPane, BorderLayout.CENTER); @@ -412,7 +393,7 @@ public abstract class UIControlPane extends JControlPane { @Override public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, 28); + return new Dimension(super.getPreferredSize().width, scale(28)); } } } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java index 034847a704..e1cab0a75d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java @@ -1,7 +1,7 @@ package com.fr.design.gui.controlpane; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.constants.UIConstants; +import com.fr.design.border.FineBorderFactory; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilist.JNameEdList; import com.fr.design.gui.ilist.ListModelElement; @@ -40,7 +40,6 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon public UIListControlPane() { super(); - } private ListControlPaneHelper getHelper() { @@ -75,9 +74,9 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon protected void initLeftPane(JPanel leftPane) { nameableList = createJNameList(); nameableList.setName(LIST_NAME); - nameableList.setSelectionBackground(UIConstants.ATTRIBUTE_PRESS); - leftPane.add(new UIScrollPane(nameableList), BorderLayout.CENTER); - + UIScrollPane scrollPane = new UIScrollPane(nameableList); + leftPane.add(scrollPane, BorderLayout.CENTER); + leftPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); nameableList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); nameableList.addMouseListener(getHelper().getListMouseListener(nameableList, this)); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java index 3b7aa02606..0e06bcd344 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java @@ -1,5 +1,8 @@ package com.fr.design.gui.controlpane; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.constants.UIConstants; import com.fr.design.gui.icontainer.UIScrollPane; @@ -9,6 +12,7 @@ import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ModNameActionListener; import com.fr.design.gui.ilist.UIList; import com.fr.design.gui.ilist.UINameEdList; +import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.widget.EventCreator; import com.fr.form.event.Listener; @@ -24,11 +28,18 @@ import javax.swing.DefaultListModel; import javax.swing.JPanel; import javax.swing.ListModel; import javax.swing.ListSelectionModel; +import javax.swing.UIManager; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import java.awt.*; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.BorderLayout; +import java.awt.AlphaComposite; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.lang.reflect.Constructor; @@ -39,6 +50,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.theme.utils.FineUIScale.scale; + /** * Created by kerry on 5/31/21 */ @@ -76,9 +91,17 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li return isPopulating; } + @Override + protected JPanel getLeftTopPane(UIToolbar topToolBar) { + UIToolbar toolbar = getTopToolBar(); + toolbar.setPreferredSize(scale(new Dimension(160, 24))); + return super.getLeftTopPane(topToolBar); + } + @Override protected void initLeftPane(JPanel leftPane) { leftPane.add(new UIScrollPane(contentPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 0)), BorderLayout.CENTER); + leftPane.setBorder(new FineRoundBorder()); } @@ -197,6 +220,7 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li nameEdList.setCellRenderer(new UINameableListCellRenderer(true, this.creators)); nameEdList.setName(text); + nameEdList.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal")); nameEdList.setSelectionBackground(UIConstants.ATTRIBUTE_PRESS); nameEdList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); nameEdList.addMouseListener(new MouseAdapter() { @@ -534,23 +558,20 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li public ListWrapperPane(String labelText, UINameEdList nameEdList) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - UILabel label = new UILabel(labelText + getWrapperLabelText()) { + UILabel label = new UILabel(" " + labelText + getWrapperLabelText()) { @Override public void paint(Graphics g) { ((Graphics2D) g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.8f)); super.paint(g); } }; - label.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 0)); - label.setOpaque(true); - label.setBackground(Color.WHITE); - label.setForeground(Color.decode("#333334")); - label.setFont(label.getFont().deriveFont(11F)); - //预留 10px 的纵向滚动条的宽度 - label.setPreferredSize(new Dimension(214, 26)); + + label.setBorder(BorderFactory.createMatteBorder(scale(1), 0, scale(1), 0, FineUIUtils.getUIColor("fill.hover", "fill.hover"))); + label.setForeground(UIManager.getColor("List.wrapper.text.fontColor")); + label.setFont(label.getFont().deriveFont(scale(11F))); + label.setPreferredSize(new Dimension(this.getPreferredSize().width, scale(24))); this.nameEdList = nameEdList; - this.add(label, BorderLayout.NORTH); - this.add(this.nameEdList, BorderLayout.CENTER); + this.add(column(cell(label), cell(this.nameEdList)).getComponent()); } public UINameEdList getNameEdList() { @@ -558,6 +579,4 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li } } - - } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UINameableListCellRenderer.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UINameableListCellRenderer.java index 40d8d98fa7..015e573e21 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UINameableListCellRenderer.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UINameableListCellRenderer.java @@ -1,6 +1,7 @@ package com.fr.design.gui.controlpane; -import com.fr.design.constants.UIConstants; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.ListModelElement; import com.fr.stable.Nameable; @@ -8,7 +9,6 @@ import sun.swing.DefaultLookup; import javax.swing.*; import javax.swing.border.Border; -import javax.swing.border.EmptyBorder; import java.awt.*; /** @@ -19,18 +19,19 @@ import java.awt.*; public class UINameableListCellRenderer extends JPanel implements ListCellRenderer { - private static final Border SAFE_NO_FOCUS_BORDER = new EmptyBorder(1, 1, 1, 1); - private static final Border DEFAULT_NO_FOCUS_BORDER = new EmptyBorder(1, 1, 1, 1); - private static final Color BORDER_COLOR = new Color(201, 198, 184); - protected static Border noFocusBorder = DEFAULT_NO_FOCUS_BORDER; - private static final int BUTTON_WIDTH = 25; + private static final Color BORDER_COLOR = UIManager.getColor("defaultBorderColor"); + private static final int BUTTON_WIDTH = UIManager.getInt("List.cellRender.button.width"); + private static final int BUTTON_HEIGHT = UIManager.getInt("List.cellRender.button.height"); private UILabel editButton; // "编辑按钮"，实际上是一个 UILabel，由列表项（UIListControlPane）统一处理点击事件 private UILabel label; private boolean isNewStyle; private NameableCreator[] creators; private Color initialLabelForeground; - public UINameableListCellRenderer( boolean isNewStyle, NameableCreator[] creators) { + private static final Icon LIST_EDIT_ICON = new LazyIcon("tool_edit"); + private static final Icon CPT_ICON = new LazyIcon("cpt_icon"); + + public UINameableListCellRenderer(boolean isNewStyle, NameableCreator[] creators) { super(); this.isNewStyle = isNewStyle; this.creators = creators; @@ -43,11 +44,11 @@ public class UINameableListCellRenderer extends private void initComponents() { editButton = new UILabel() { public Dimension getPreferredSize() { - return new Dimension(BUTTON_WIDTH, BUTTON_WIDTH); + return FineUIScale.scale(new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT)); } }; - editButton.setIcon(isNewStyle ? UIConstants.LIST_EDIT_ICON : UIConstants.CPT_ICON); - editButton.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, UIConstants.LIST_ITEM_SPLIT_LINE)); + editButton.setIcon(isNewStyle ? LIST_EDIT_ICON : CPT_ICON); + editButton.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, BORDER_COLOR)); editButton.setHorizontalAlignment(SwingConstants.CENTER); label = new UILabel(); label.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); @@ -58,7 +59,7 @@ public class UINameableListCellRenderer extends } private Border getNoFocusBorder() { - return BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LIST_ITEM_SPLIT_LINE); + return BorderFactory.createMatteBorder(0, 0, 1, 0, BORDER_COLOR); } private void setText(String t) { @@ -87,18 +88,13 @@ public class UINameableListCellRenderer extends if (isSelected) { setBackground(bg == null ? list.getSelectionBackground() : bg); setForeground(fg == null ? list.getSelectionForeground() : fg); - label.setForeground(Color.WHITE); - if (isNewStyle) { - editButton.setIcon(UIConstants.LIST_EDIT_WHITE_ICON); - } - } - else { - setBackground(list.getBackground()); + } else { + setBackground(UIManager.getColor("List.cellRender.background")); setForeground(list.getForeground()); label.setForeground(initialLabelForeground); - if (isNewStyle) { - editButton.setIcon(UIConstants.LIST_EDIT_ICON); - } + } + if (isNewStyle) { + editButton.setIcon(LIST_EDIT_ICON); } setText((value == null) ? "" : value.toString()); @@ -107,11 +103,11 @@ public class UINameableListCellRenderer extends setFont(list.getFont()); if (value instanceof ListModelElement) { - Nameable wrappee = ((ListModelElement) value).wrapper; + Nameable wrapper = ((ListModelElement) value).wrapper; this.setText(((ListModelElement) value).wrapper.getName()); for (NameableCreator creator : creators) { - if (creator.menuIcon() != null && creator.acceptObject2Populate(wrappee) != null) { + if (creator.menuIcon() != null && creator.acceptObject2Populate(wrapper) != null) { this.setToolTipText(creator.createTooltip()); break; } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java index 29c8c0602b..79c96067fe 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java @@ -1,6 +1,6 @@ package com.fr.design.gui.controlpane; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; @@ -230,8 +230,7 @@ public class UISimpleListControlPane extends BasicPane { public MoveUpItemAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); this.setMnemonic('U'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/control/up.png")); + this.setSmallIcon(new LazyIcon("move_up")); } @Override @@ -263,8 +262,7 @@ public class UISimpleListControlPane extends BasicPane { public MoveDownItemAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); this.setMnemonic('D'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/control/down.png")); + this.setSmallIcon(new LazyIcon("move_down")); } @Override @@ -294,8 +292,7 @@ public class UISimpleListControlPane extends BasicPane { public SortItemAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); this.setMnemonic('S'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/control/sortAsc.png")); + this.setSmallIcon(new LazyIcon("sort_desc")); } @Override @@ -423,7 +420,7 @@ public class UISimpleListControlPane extends BasicPane { private void initComponents() { label = new UILabel(); - label.setBorder(BorderFactory.createEmptyBorder(3, 10, 3, 0)); +// label.setBorder(BorderFactory.createEmptyBorder(3, 10, 3, 0)); initialLabelForeground = label.getForeground(); this.setLayout(new BorderLayout()); this.add(label, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/AbstractShortCutFactory.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/AbstractShortCutFactory.java index 8d837fcc09..cf95c6f0b8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/AbstractShortCutFactory.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/AbstractShortCutFactory.java @@ -1,6 +1,6 @@ package com.fr.design.gui.controlpane.shortcutfactory; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ShortCut4JControlPane; @@ -99,8 +99,7 @@ public abstract class AbstractShortCutFactory { RemoveItemAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Remove"))); this.setMnemonic('R'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/base/images/cell/control/remove.png")); + this.setSmallIcon(new LazyIcon("remove")); } @Override @@ -116,8 +115,7 @@ public abstract class AbstractShortCutFactory { CopyItemAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); this.setMnemonic('C'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/m_edit/copy.png")); + this.setSmallIcon(new LazyIcon("tool_copy")); } @Override @@ -133,8 +131,7 @@ public abstract class AbstractShortCutFactory { MoveUpItemAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); this.setMnemonic('U'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/control/up.png")); + this.setSmallIcon(new LazyIcon("move_up")); } @Override @@ -150,8 +147,7 @@ public abstract class AbstractShortCutFactory { MoveDownItemAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); this.setMnemonic('D'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/control/down.png")); + this.setSmallIcon(new LazyIcon("move_down")); } @Override @@ -166,8 +162,7 @@ public abstract class AbstractShortCutFactory { SortItemAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); this.setMnemonic('S'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/control/sortAsc.png")); + this.setSmallIcon(new LazyIcon("sort_desc")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java index d0cf10f7e8..b584822484 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java @@ -1,5 +1,6 @@ package com.fr.design.gui.controlpane.shortcutfactory; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.controlpane.NameableCreator; @@ -63,7 +64,7 @@ public class OldShortCutFactory extends AbstractShortCutFactory { this.creator = creators[0]; this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Add"))); this.setMnemonic('A'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); + this.setSmallIcon(new LazyIcon("add")); } @Override @@ -79,7 +80,7 @@ public class OldShortCutFactory extends AbstractShortCutFactory { AddItemMenuDef(NameableCreator[] creators) { this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Add"))); this.setMnemonic('A'); - this.setIconPath("/com/fr/design/images/control/addPopup.png"); + this.setIcon(new LazyIcon("add_popup")); wrapActionListener(creators); } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/ShortCutFactory.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/ShortCutFactory.java index da0b552682..ede336116e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/ShortCutFactory.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/ShortCutFactory.java @@ -1,5 +1,6 @@ package com.fr.design.gui.controlpane.shortcutfactory; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.actions.core.ActionFactory; @@ -66,7 +67,7 @@ public class ShortCutFactory extends AbstractShortCutFactory { this.creator = creators[0]; this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); + this.setSmallIcon(new LazyIcon("add")); } /** @@ -120,7 +121,7 @@ public class ShortCutFactory extends AbstractShortCutFactory { super(true); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); - this.setIconPath("/com/fr/design/images/control/addPopup.png"); + this.setIcon(new LazyIcon("add_popup")); wrapActionListener(creators); } diff --git a/designer-base/src/main/java/com/fr/design/gui/core/ReactiveCardPane.java b/designer-base/src/main/java/com/fr/design/gui/core/ReactiveCardPane.java new file mode 100644 index 0000000000..8e2897c2b1 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/core/ReactiveCardPane.java @@ -0,0 +1,73 @@ +package com.fr.design.gui.core; + +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Supplier; + +/** + * 简单的响应式面板容器，提供切换布局的功能 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/25 + */ +public class ReactiveCardPane extends JPanel { + + String selectKey; + Map> cardFactory = new HashMap<>(); + + /** + * 创建响应式面板容器 + * + * @return 面板 + */ + public static ReactiveCardPane create() { + ReactiveCardPane container = new ReactiveCardPane(); + container.setLayout(new BorderLayout()); + return container; + } + + /** + * 添加创建布局卡片的supplier + *

由于swing的布局生成机制，单一组件不能在不同布局中出现，因此无法存储构建好的布局，可以存储工厂方法，使用时调用

+ * + * @param key supplier标识 + * @param supplier 工厂方法 + * @return this + */ + public ReactiveCardPane addSupplier(String key, Supplier supplier) { + cardFactory.put(key, supplier); + return this; + } + + /** + * 选择布局 + * + * @param key supplier标识 + * @return this + */ + public ReactiveCardPane select(String key) { + this.selectKey = key; + return this; + } + + /** + * 渲染卡片 + * + * @throws IllegalArgumentException 非法key值 + */ + public void populate() throws IllegalArgumentException { + if (selectKey == null || !cardFactory.containsKey(selectKey)) { + throw new IllegalArgumentException("container select key is illegal!"); + } + removeAll(); + add(cardFactory.get(selectKey).get(), BorderLayout.CENTER); + setVisible(true); + revalidate(); + repaint(); + } + +} diff --git a/designer-base/src/main/java/com/fr/design/gui/core/UserDefinedWidgetOption.java b/designer-base/src/main/java/com/fr/design/gui/core/UserDefinedWidgetOption.java index 40490702de..301c518355 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/UserDefinedWidgetOption.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/UserDefinedWidgetOption.java @@ -1,8 +1,8 @@ package com.fr.design.gui.core; +import com.fine.theme.icon.LazyIcon; import javax.swing.Icon; -import com.fr.base.BaseUtils; import com.fr.form.ui.NameWidget; import com.fr.form.ui.Widget; @@ -21,7 +21,7 @@ public class UserDefinedWidgetOption extends WidgetOption { @Override public Icon optionIcon() { - return BaseUtils.readIcon("/com/fr/design/images/data/user_widget.png"); + return new LazyIcon("customButton"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java index 4c9db5a6a0..2dc0d630fc 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java @@ -1,7 +1,7 @@ package com.fr.design.gui.core; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; -import com.fr.base.svg.IconUtils; import com.fr.form.ui.Button; import com.fr.form.ui.CheckBox; import com.fr.form.ui.CheckBoxGroup; @@ -26,9 +26,12 @@ import com.fr.form.ui.Widget; import com.fr.form.ui.WidgetConfig; import com.fr.form.ui.WidgetInfoConfig; import com.fr.general.ComparatorUtils; + +import javax.swing.Icon; import java.io.Serializable; import java.util.ArrayList; -import javax.swing.Icon; + +import static com.fr.design.i18n.Toolkit.i18nText; public abstract class WidgetOption implements Serializable { @@ -111,7 +114,7 @@ public abstract class WidgetOption implements Serializable { String name = nameIt.next(); WidgetConfig widgetConfig = mgr.getWidgetConfig(name); if (widgetConfig instanceof UserDefinedWidgetConfig) { - list.add(WidgetOptionFactory.createByWidgetClass(name, BaseUtils.readIcon("/com/fr/design/images/data/user_widget.png"), + list.add(WidgetOptionFactory.createByWidgetClass(name, new LazyIcon("customButton"), ((UserDefinedWidgetConfig) widgetConfig).getWidget().getClass())); } } @@ -123,7 +126,7 @@ public abstract class WidgetOption implements Serializable { */ public static WidgetOption[] getReportWidgetInstance() { return new WidgetOption[]{TEXTEDITOR, TEXTAREA, NUMBEREDITOR, PASSWORD, BUTTON, CHECKBOX, RADIOGROUP, CHECKBOXGROUP, COMBOBOX, - COMBOCHECKBOX, DATEEDITOR, MULTI_FILEEDITOR, LIST, IFRAMEDITOR, TREECOMBOBOX, TREE}; + COMBOCHECKBOX, DATEEDITOR, MULTI_FILEEDITOR, LIST, IFRAMEDITOR, TREECOMBOBOX, TREE}; } @@ -144,79 +147,102 @@ public abstract class WidgetOption implements Serializable { */ public static WidgetOption[] getFormWidgetIntance() { return new WidgetOption[]{TEXTEDITOR, LABEL, FREEBUTTON, COMBOBOX, COMBOCHECKBOX, DATEEDITOR, - NUMBEREDITOR, TREECOMBOBOX, RADIOGROUP, CHECKBOXGROUP, TEXTAREA, PASSWORD, CHECKBOX, TREE, MULTI_FILEEDITOR,PICTURE}; + NUMBEREDITOR, TREECOMBOBOX, RADIOGROUP, CHECKBOXGROUP, TEXTAREA, PASSWORD, CHECKBOX, TREE, MULTI_FILEEDITOR, PICTURE}; } - public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"), - "/com/fr/design/images/buttonicon/widget/date_16", + public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass( + i18nText("Fine-Design_Basic_Widget_Type_Date"), + "date", DateEditor.class); - public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"), - "/com/fr/design/images/buttonicon/widget/tree_16", TreeEditor.class); + public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass( + i18nText("Fine-Design_Report_View_Tree"), + "widget_tree", + TreeEditor.class); - public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), "/com/fr/design/images/buttonicon/widget/comboboxtree16", + public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass( + i18nText("Fine-Design_Report_Tree_ComboBox"), + "comboboxtree", TreeComboBoxEditor.class); public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), "/com/fr/design/images/buttonicon/widget/checkbox_group_16", CheckBoxGroup.class); + i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), + "checkbox_group", + CheckBoxGroup.class); public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), "/com/fr/design/images/buttonicon/widget/button_group_16", + i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), + "button_group", RadioGroup.class); public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), "/com/fr/design/images/buttonicon/widget/number_field_16", NumberEditor.class); + i18nText("Fine-Design_Basic_Widget_Type_Number"), + "number_field", + NumberEditor.class); public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), "/com/fr/design/images/buttonicon/widget/label_16", + i18nText("Fine-Design_Basic_Widget_Type_Label"), + "label", Label.class); public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"), + i18nText("Fine-Design_Basic_Widget_Type_Button"), + "button", Button.class); public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), "/com/fr/design/images/buttonicon/widget/button_16", + i18nText("Fine-Design_Basic_Widget_Type_Button"), + "button", FreeButton.class); public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), "/com/fr/design/images/buttonicon/widget/files_up", + i18nText("Fine-Design_Basic_Widget_Type_File"), + "files_up", MultiFileEditor.class); public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), "/com/fr/design/images/buttonicon/widget/combo_box_16", + i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), + "combo_box", ComboBox.class); public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), "/com/fr/design/images/buttonicon/widget/combo_check_16", + i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), + "combo_check", ComboCheckBox.class); public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), "/com/fr/design/images/buttonicon/widget/check_box_16", + i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), + "check_box", CheckBox.class); public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_List"), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_List"), + BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"), ListEditor.class); public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Text") - , "/com/fr/design/images/buttonicon/widget/text_field_16", + i18nText("Fine-Design_Basic_Widget_Type_Text"), + "text_field", TextEditor.class); public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), "/com/fr/design/images/buttonicon/widget/text_area_16", + i18nText("Fine-Design_Basic_Widget_Type_Textarea"), + "text_area", TextArea.class); public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"), - "/com/fr/design/images/buttonicon/widget/password_field_16", Password.class); + i18nText("Fine-Design_Basic_Widget_Type_Password"), + "password_field", Password.class); - public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"), + public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass( + i18nText("Fine-Design_Report_Form_Iframe"), + "iframe", IframeEditor.class); - public static final WidgetOption PICTURE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Image"), IconUtils.readIcon("/com/fr/web/images/form/resources/picture_widget_16.png"), + public static final WidgetOption PICTURE = WidgetOptionFactory.createByWidgetClass( + i18nText("Fine-Design_Basic_Widget_Type_Image"), + "picture", PictureWidget.class); } diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java index 8d290ac2a8..e58e9a4edf 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java @@ -1,6 +1,6 @@ package com.fr.design.gui.core; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.svg.IconUtils; import com.fr.form.ui.Widget; @@ -9,7 +9,7 @@ import javax.swing.Icon; public class WidgetOptionFactory { public static WidgetOption createByWidgetClass(String optionName, Class widgetClass) { - return new CustomWidgetOption(optionName, BaseUtils.readIcon("/com/fr/design/images/data/user_widget.png"), widgetClass); + return new CustomWidgetOption(optionName, new LazyIcon("customButton"), widgetClass); } public static WidgetOption createByWidgetClass(String optionName, Icon optionIcon, Class widgetClass) { @@ -17,7 +17,7 @@ public class WidgetOptionFactory { } public static WidgetOption createByWidgetClass(String optionName, String resource, Class widgetClass) { - Icon optionIcon = IconUtils.readIcon(resource); + Icon optionIcon = resource.startsWith("/")? IconUtils.readIcon(resource):new LazyIcon(resource); return new CustomWidgetOption(optionName, optionIcon, widgetClass); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java index 3d754ba0ac..43b4704a55 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java @@ -1,6 +1,8 @@ package com.fr.design.gui.date; import com.fanruan.product.ProductConstantsBase; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.base.background.GradientBackground; import com.fr.design.carton.MonthlyCartonFile; @@ -25,6 +27,7 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.UIManager; +import javax.swing.border.LineBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.EventListenerList; @@ -52,11 +55,19 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; +import static com.fine.theme.utils.FineUIScale.scale; + public class UICalendarPanel extends JPanel { - private static final Font FONT_UI = DesignUtils.getDefaultGUIFont().applySize(12); - private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Black_Font"), Font.PLAIN, 12); + private static final Font FONT_UI = DesignUtils.getDefaultGUIFont().applySize(scale(12)); + private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Black_Font"), Font.PLAIN, scale(12)); private static final int WEEKDAY_COUNT = 7; private static final int TOTAL_DAYS_COUNT = 42; + + private static final int WIDTH = scale(31); + private static final int HEIGHT = scale(19); + private static final int START_X = scale(30); + private static final int START_Y = scale(19); + //卡顿日志所在地址 private static final String JOURNAL_FILE_PATH = StableUtils.pathJoin(ProductConstantsBase.getEnvHome(), "journal_log"); protected Color selectedBackground; @@ -125,15 +136,15 @@ public class UICalendarPanel extends JPanel { dayBttListener = createDayBttListener(); //renderer this - setPreferredSize(new Dimension(218, 179)); - setBackground(new Color(0xFFFFFF)); - setBorder(BorderFactory.createLineBorder(new Color(0x959595))); + setPreferredSize(scale(new Dimension(218, 179))); + setBackground(FlatUIUtils.getUIColor("fill.normal", Color.WHITE)); + setBorder(new LineBorder(FlatUIUtils.getUIColor("defaultBorderColor", Color.BLACK))); setLayout(FRGUIPaneFactory.createBorderLayout()); add(BorderLayout.NORTH, createNorthPane()); add(BorderLayout.CENTER, createCenterPane()); if (isTimerPicker) { - setPreferredSize(new Dimension(218, 209)); + setPreferredSize(scale(new Dimension(218, 209))); add(BorderLayout.SOUTH, createSouthPane()); updateHMS(); } @@ -162,7 +173,7 @@ public class UICalendarPanel extends JPanel { BaseUtils.readIcon("/com/fr/design/images/calender/month_reduce_hover.png"), BaseUtils.readIcon("/com/fr/design/images/calender/month_reduce_click.png") }); - monthMinus.setPreferredSize(new Dimension(20, 20)); + monthMinus.setPreferredSize(scale(new Dimension(20, 20))); pNorth.add(monthMinus); monthLabel = new UILabel("", UILabel.CENTER); monthLabel.setBackground(new Color(0xFFFFFF)); @@ -177,7 +188,7 @@ public class UICalendarPanel extends JPanel { BaseUtils.readIcon("/com/fr/design/images/calender/month_add_hover.png"), BaseUtils.readIcon("/com/fr/design/images/calender/month_add_click.png") }); - monthPlus.setPreferredSize(new Dimension(20, 20)); + monthPlus.setPreferredSize(scale(new Dimension(20, 20))); monthPlus.setHorizontalAlignment(SwingConstants.RIGHT); pNorth.add(monthPlus); pNorth.add(Box.createHorizontalStrut(11)); @@ -195,7 +206,7 @@ public class UICalendarPanel extends JPanel { private JPanel createCenterPane() { //星期日 星期一 星期二 星期三 星期四 星期五 星期六 JPanel pWeeks = new JPanel(new GridLayout(1, 7, 1, 0)); - pWeeks.setPreferredSize(new Dimension(216, 22)); + pWeeks.setPreferredSize(scale(new Dimension(216, 22))); pWeeks.setBackground(new Color(0xFFFFFF)); pWeeks.setOpaque(true); String[] strWeeks = new String[]{StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Mon"), @@ -214,7 +225,7 @@ public class UICalendarPanel extends JPanel { //中间放日期的面板 days = new DayPane(); days.setOpaque(true); - days.setPreferredSize(new Dimension(216, 115)); + days.setPreferredSize(scale(new Dimension(216, 115))); JPanel pCenter = FRGUIPaneFactory.createBorderLayout_S_Pane(); pCenter.setOpaque(true); pCenter.add(pWeeks, BorderLayout.NORTH); @@ -222,7 +233,7 @@ public class UICalendarPanel extends JPanel { //显示今天的日期,直接单击图标跳到今天 GradientPane pToday = new GradientPane(new GradientBackground(new Color(0x097BDA), new Color(0x40A3EE), GradientBackground.TOP2BOTTOM), false); - pToday.setPreferredSize(new Dimension(216, 18)); + pToday.setPreferredSize(scale(new Dimension(216, 18))); pToday.setLayout(new BorderLayout()); lbToday = new UIDayLabel(new Date(), false); lbToday.setForeground(new Color(0x000000)); @@ -236,23 +247,23 @@ public class UICalendarPanel extends JPanel { private JPanel createSouthPane() { JPanel sPane = new JPanel(); - sPane.setPreferredSize(new Dimension(216, 30)); + sPane.setPreferredSize(scale(new Dimension(216, 30))); sPane.setBackground(Color.WHITE); sPane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 6)); UILabel timeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Time") + ":"); - timeLabel.setBorder(BorderFactory.createEmptyBorder(0, 9, 0, 5)); + timeLabel.setBorder(new ScaledEmptyBorder(0, 9, 0, 5)); timeLabel.setFont(FONT_UI); sPane.add(timeLabel); hms = new HMSPane(); sPane.add(hms); UILabel gap = new UILabel(); - gap.setPreferredSize(new Dimension(26, 1)); + gap.setPreferredSize(scale(new Dimension(26, 1))); sPane.add(gap); UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")) { public Dimension getPreferredSize() { - return new Dimension(32, 18); + return scale(new Dimension(32, 18)); } public Insets getInsets() { @@ -427,7 +438,7 @@ public class UICalendarPanel extends JPanel { gp.setBorder(null); UIDayLabel label = new UIDayLabel(setupCalendar.getTime()); label.setHorizontalAlignment(SwingConstants.RIGHT); - label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 9)); + label.setBorder(new ScaledEmptyBorder(0, 0, 0, 9)); if ("1".equals(label.getText())) { isCurrentMonth = !isCurrentMonth; } @@ -650,12 +661,12 @@ public class UICalendarPanel extends JPanel { public void paint(Graphics g) { super.paint(g); - int width = 31; - int height = 19; + int width = UICalendarPanel.WIDTH; + int height = UICalendarPanel.HEIGHT; Color oldColor = g.getColor(); g.setColor(new Color(0xDADADA)); - int start_x = 30; - int start_y = 19; + int start_x = UICalendarPanel.START_X; + int start_y = UICalendarPanel.START_Y; for (int i = 0; i < 6; i++) { g.drawLine(start_x, 0, start_x, getHeight()); start_x += width; @@ -678,19 +689,19 @@ public class UICalendarPanel extends JPanel { private void paintChindPane(Graphics g, int index) { if (index % 7 == 0) { - int y1 = index / 7 * 19; - g.drawLine(0, y1, 30, y1); - g.drawLine(0, y1 + 19, 30, y1 + 19); - g.drawLine(30, y1, 30, y1 + 19); + int y1 = index / 7 * UICalendarPanel.HEIGHT; + g.drawLine(0, y1, UICalendarPanel.START_X, y1); + g.drawLine(0, y1 + UICalendarPanel.HEIGHT, UICalendarPanel.START_X, y1 + UICalendarPanel.HEIGHT); + g.drawLine(UICalendarPanel.START_X, y1, UICalendarPanel.START_X, y1 + UICalendarPanel.HEIGHT); } else if (index % 7 == 6) { - int y1 = index / 7 * 19; - g.drawLine(185, y1, 216, y1); - g.drawLine(185, y1 + 19, 216, y1 + 19); - g.drawLine(185, y1, 185, y1 + 19); + int y1 = index / 7 * UICalendarPanel.HEIGHT; + g.drawLine(scale(185), y1, scale(216), y1); + g.drawLine(scale(185), y1 + UICalendarPanel.HEIGHT, scale(216), y1 + UICalendarPanel.HEIGHT); + g.drawLine(scale(185), y1, scale(185), y1 + UICalendarPanel.HEIGHT); } else { - int x1 = index % 7 * 31 - 1; - int y1 = index / 7 * 19; - g.drawRect(x1, y1, 31, 19); + int x1 = index % 7 * UICalendarPanel.WIDTH - 1; + int y1 = index / 7 * UICalendarPanel.HEIGHT; + g.drawRect(x1, y1, UICalendarPanel.WIDTH, UICalendarPanel.HEIGHT); } } @@ -722,7 +733,7 @@ public class UICalendarPanel extends JPanel { private CalendarNumberField selectedNumberField; public HMSPane() { - this.setPreferredSize(new Dimension(101, 18)); + this.setPreferredSize(scale(new Dimension(101, 18))); this.setLayout(new BorderLayout(0, 0)); this.setBackground(null); @@ -775,7 +786,7 @@ public class UICalendarPanel extends JPanel { }; nextButton.setRoundBorder(true, Constants.LEFT); JPanel arrowPane = new JPanel(); - arrowPane.setPreferredSize(new Dimension(11, 18)); + arrowPane.setPreferredSize(scale(new Dimension(11, 18))); arrowPane.setLayout(new GridLayout(2, 1)); arrowPane.add(preButton); arrowPane.add(nextButton); @@ -828,7 +839,7 @@ public class UICalendarPanel extends JPanel { uiLabel.setHorizontalAlignment(SwingConstants.CENTER); uiLabel.setBackground(null); uiLabel.setBorder(null); - uiLabel.setPreferredSize(new Dimension(6, 10)); + uiLabel.setPreferredSize(scale(new Dimension(6, 10))); return uiLabel; } diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java b/designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java index 1da26c302c..cbbc8ceeea 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java @@ -1,5 +1,8 @@ package com.fr.design.gui.date; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxUI; import com.fr.design.layout.FRGUIPaneFactory; @@ -105,7 +108,7 @@ public class UIDatePicker extends UIComboBox implements Serializable { textField.setDocument(dateDocument); //设置Model为单值Model this.setModel(model); - updateUI(); + setUI(getUIComboBoxUI()); } public UIDatePicker(int formatStyle, Date initialDatetime) throws UnsupportedOperationException { @@ -290,6 +293,20 @@ public class UIDatePicker extends UIComboBox implements Serializable { @Override protected ComboBoxUI getUIComboBoxUI() { return new UIComboBoxUI() { + + @Override + protected UIButton createArrowButton() { + arrowButton = new UIButton(new LazyIcon("down_arrow")) { + public boolean shouldResponseChangeListener() { + return false; + } + }; + arrowButton.addMouseListener(this); + comboBox.addMouseListener(this); + FineUIStyle.setStyle(arrowButton, FineUIStyle.PLAIN_BUTTON); + return (UIButton) arrowButton; + } + @Override protected ComboPopup createPopup() { return new DatePopup(comboBox); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/AbstractAttrNoScrollPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/AbstractAttrNoScrollPane.java index 15d50d00cb..57e4095ffd 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/AbstractAttrNoScrollPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/AbstractAttrNoScrollPane.java @@ -1,5 +1,7 @@ package com.fr.design.gui.frpane; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; @@ -17,7 +19,6 @@ import java.awt.*; * 用于属性表中的面板，主要是为了给包含于这个面板内部的众多UI控件加监听事件，在UI控件改变的时候，通知模板做相应的变化 */ public abstract class AbstractAttrNoScrollPane extends BasicPane { - private static final int DEFAULT_HEIGHT = 250; private static boolean hasChangeListener; protected JPanel leftContentPane; @@ -59,7 +60,7 @@ public abstract class AbstractAttrNoScrollPane extends BasicPane { protected void initContentPane() { leftContentPane = createContentPane(); if (leftContentPane != null) { - leftContentPane.setBorder(BorderFactory.createMatteBorder(10, 10, 0, 0, original)); + leftContentPane.setBorder(new ScaledEmptyBorder(LayoutConstants.VERTICAL_GAP, 0, 0, 0)); this.add(leftContentPane, BorderLayout.CENTER); } } @@ -125,14 +126,6 @@ public abstract class AbstractAttrNoScrollPane extends BasicPane { return hasChangeListener; } - /** - * 返回预定义的大小. - */ - public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, DEFAULT_HEIGHT); - } - - /** * 返回绑定的属性事件. * @param listener 增加监听 diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java index ebe6abb672..cd9f7c0367 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java @@ -1,27 +1,33 @@ package com.fr.design.gui.frpane; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.JListUtils; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; -import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; import javax.swing.JList; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.ListSelectionModel; +import javax.swing.JOptionPane; +import javax.swing.DefaultListCellRenderer; import javax.swing.SwingUtilities; +import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -29,13 +35,17 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + public abstract class EditingStringListPane extends BasicBeanPane> { private static final long serialVersionUID = 1L; private DefaultListModel model; private JList jlist; private UIButton addButton; - private UIButton editButton; + private UIButton modifyButton; private UIButton removeButton; private UIButton moveUpButton; private UIButton moveDownButton; @@ -43,6 +53,11 @@ public abstract class EditingStringListPane extends BasicBeanPane> public EditingStringListPane() { super(); this.setLayout(FRGUIPaneFactory.createBorderLayout()); + //按钮 + JPanel buttonPane = initButtonPane(); + buttonPane.setBorder(new ScaledEmptyBorder(0,0,10,0)); + this.add(buttonPane, BorderLayout.NORTH); + //列表 model = new DefaultListModel(); jlist = new JList(model); jlist.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); @@ -56,34 +71,38 @@ public abstract class EditingStringListPane extends BasicBeanPane> } }); - - addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); - editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Modify")); - removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); - moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); - moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); - - JPanel eastPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); - eastPane.add(editButton); - eastPane.add(removeButton); - eastPane.add(moveUpButton); - eastPane.add(moveDownButton); - this.add(GUICoreUtils.createBorderPane(eastPane, BorderLayout.NORTH), BorderLayout.EAST); - - JPanel centerPane = new JPanel(new BorderLayout(0, 5)); - this.add(centerPane, BorderLayout.CENTER); - JPanel northcenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - northcenterPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); - northcenterPane.add(addButton, BorderLayout.EAST); - centerPane.add(northcenterPane, BorderLayout.NORTH); - centerPane.add(new JScrollPane(jlist), BorderLayout.CENTER); - + jlist.setBackground(FlatUIUtils.getUIColor("fill.normal", Color.WHITE)); + JScrollPane scrollPane = new JScrollPane(jlist); + scrollPane.setPreferredSize(FineUIScale.scale(new Dimension(620,350))); + scrollPane.setBorder(new FineRoundBorder()); + this.add(scrollPane, BorderLayout.CENTER); + //统一加按钮事件 this.addListener(); - this.addButton.setEnabled(false); this.checkEnableState(); } + private JPanel initButtonPane() { + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"), new LazyIcon("add")); + addButton.setDisabledIcon(new LazyIcon("add").disabled()); + + modifyButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Modify"), new LazyIcon("edit")); + modifyButton.setDisabledIcon(new LazyIcon("edit").disabled()); + + removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), new LazyIcon("remove")); + removeButton.setDisabledIcon(new LazyIcon("remove").disabled()); + + moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up"), new LazyIcon("move_up")); + moveUpButton.setDisabledIcon(new LazyIcon("move_up").disabled()); + + moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down"), new LazyIcon("move_down")); + moveDownButton.setDisabledIcon(new LazyIcon("move_down").disabled()); + + return row(flex(), + row(6, cell(addButton), cell(modifyButton), cell(removeButton), cell(moveUpButton), cell(moveDownButton)) + ).getComponent(); + } + private void addListener() { addListener1(); @@ -119,7 +138,6 @@ public abstract class EditingStringListPane extends BasicBeanPane> private void addListener1() { addButton.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { String newvalue = getAddOrEditString(); @@ -133,7 +151,7 @@ public abstract class EditingStringListPane extends BasicBeanPane> } } }); - editButton.addActionListener(new ActionListener() { + modifyButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -152,9 +170,9 @@ public abstract class EditingStringListPane extends BasicBeanPane> Object selected = jlist.getSelectedValue(); if (selected != null) { int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), - Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?", - Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), - JOptionPane.OK_CANCEL_OPTION); + Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?", + Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), + JOptionPane.OK_CANCEL_OPTION); if (re == JOptionPane.OK_OPTION) { JListUtils.removeSelectedListItems(jlist); } @@ -174,7 +192,7 @@ public abstract class EditingStringListPane extends BasicBeanPane> private void setEditEnabled(boolean enabled) { this.removeButton.setEnabled(enabled); - this.editButton.setEnabled(enabled); + this.modifyButton.setEnabled(enabled); this.moveUpButton.setEnabled(enabled); this.moveDownButton.setEnabled(enabled); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java new file mode 100644 index 0000000000..5ed4b5bcf3 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/FineTabbedPane.java @@ -0,0 +1,228 @@ +package com.fr.design.gui.frpane; + +import com.fine.swing.ui.layout.Box; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.design.utils.ColorUtils; + +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Color; +import java.awt.Component; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Map; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineClientProperties.PANEL_TYPE; +import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL; + +/** + * Tab面板组件 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/05/14 + */ +public class FineTabbedPane extends Box { + + private CardLayout cards; + private JPanel centerPane; + private final float headRatio; + private final UIButtonGroup tabGroup; + private final Map tabComponents; + private final int[] tabLayout; + + private FineTabbedPane(Map tabComponents, float headRatio, int[] tabLayout) { + this.headRatio = headRatio; + this.tabComponents = tabComponents; + this.tabLayout = tabLayout; + + String[] titleArray = tabComponents.keySet().toArray(new String[0]); + this.tabGroup = new UIButtonGroup<>(titleArray, titleArray, tabLayout); + + initLayout(); + initListeners(); + } + + /** + * 建造者模式创建TabPane + * + * @return TabPaneBuilder + */ + public static TabPaneBuilder builder() { + return new TabPaneBuilder(); + } + + /** + * FineTabbedPane建造者 + */ + public static class TabPaneBuilder { + private int[] tabLayout; + private float headRatio = 0.5f; + private final Map tabComponents = new LinkedHashMap<>(); + + /** + * 设置头部居中比例，0-1之间 + * + * @param headRatio 头部居中比例 + * @return TabPaneBuilder + */ + public TabPaneBuilder withHeadRatio(float headRatio) { + this.headRatio = headRatio; + return this; + } + + /** + * 设置Tab布局，形如[3,4]即为首行3个组件，次行4个组件 + * + * @param tabLayout Tab头部布局 + * @return TabPaneBuilder + */ + public TabPaneBuilder withTabLayout(int[] tabLayout) { + this.tabLayout = tabLayout; + return this; + } + + /** + * 添加tab标签 + * + * @param title tab标签标头 + * @param component 组件 + * @return TabPaneBuilder + */ + public TabPaneBuilder addTab(String title, Component component) { + JPanel wrapperPane = new JPanel(new BorderLayout()); + wrapperPane.add(component, BorderLayout.CENTER); + this.tabComponents.put(title, wrapperPane); + return this; + } + + /** + * 构造 + * + * @return FineTabbedPane + */ + public FineTabbedPane build() { + if (headRatio > 1) { + throw new IllegalArgumentException("illegal headRatio argument!"); + } + if (tabLayout == null) { + tabLayout = new int[]{tabComponents.size()}; + } else if (Arrays.stream(tabLayout).sum() != tabComponents.size()) { + throw new IllegalArgumentException("illegal tab layout argument!"); + } + return new FineTabbedPane(tabComponents, headRatio, tabLayout); + } + } + + private void initLayout() { + initCoreComponents(); + setMatchParentSize(true); + float flexRatio = (1 - headRatio) / 2; + int headHeight = FlatUIUtils.getUIInt("Component.defaultHeight",24) * tabLayout.length / 2; + add( + column( + row( + flex(flexRatio), cell(tabGroup).weight(headRatio), flex(flexRatio) + ), + flex() + ), + column( + fix(headHeight), + cell(centerPane).with(it -> it.setBorder(new ScaledEmptyBorder(headHeight + 10, 10, 10, 10))).weight(1) + ) + ); + fillBackgroundColor(); + } + + private void initCoreComponents() { + cards = new CardLayout(); + centerPane = new JPanel(cards); + centerPane.putClientProperty(PANEL_TYPE, ROUNDED_PANEL); + tabComponents.forEach((key, value) -> { + value.setOpaque(false); + centerPane.add(value, key); + }); + } + + private void fillBackgroundColor() { + Color fillColor = FineUIUtils.getUIColor("FineTabbedPane.background", "fill.gray"); + Color defaultColor = FineUIUtils.getUIColor("default.background", "Component.background"); + ColorUtils.syncBackgroundIfAbsent(centerPane, fillColor, defaultColor); + } + + private void initListeners() { + tabGroup.addChangeListener((e) -> { + cards.show(centerPane, String.valueOf(tabGroup.getSelectedItem())); + // tab切换时触发事件 + fireStateChanged(); + }); + tabGroup.setSelectedIndex(0); + cards.show(centerPane, String.valueOf(tabGroup.getSelectedItem())); + } + + private void fireStateChanged() { + ChangeEvent evt = new ChangeEvent(this); + for (ChangeListener listener : listenerList.getListeners(ChangeListener.class)) { + listener.stateChanged(evt); + } + } + + /** + * 添加事件监听 + * + * @param l 监听器 + */ + public void addChangeListener(ChangeListener l) { + listenerList.add(ChangeListener.class, l); + } + + /** + * 移除事件监听 + * + * @param l 监听器 + */ + public void removeChangeListener(ChangeListener l) { + listenerList.remove(ChangeListener.class, l); + } + + /** + * 获取当前选中的Tab组件 + * + * @return Tab组件 + */ + public Component getSelectedComponent() { + return tabComponents.get(String.valueOf(tabGroup.getSelectedItem())); + } + + /** + * 设置选中的Tab组件 + * + * @param i 组件序号 + */ + public void setSelectedIndex(int i) { + tabGroup.setSelectedIndex(i); + cards.show(centerPane, String.valueOf(tabGroup.getSelectedItem())); + } + + /** + * 获取选中的组件序号 + * + * @return 组件序号 + */ + public int getSelectedIndex() { + return tabGroup.getSelectedIndex(); + } + +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java index 0a8e4769a9..56f6776ac4 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java @@ -1,12 +1,16 @@ package com.fr.design.gui.frpane; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.ExtraDesignClassManager; +import com.fr.design.border.FineBorderFactory; import com.fr.design.designer.TargetComponent; -import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.fun.HyperlinkProvider; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.UIListControlPane; +import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.module.DesignModuleFactory; +import com.fr.design.widget.FRWidgetFactory; import com.fr.general.GeneralContext; import com.fr.general.NameObject; @@ -20,10 +24,16 @@ import com.fr.plugin.observer.PluginEventListener; import com.fr.stable.ListMap; import com.fr.stable.Nameable; +import javax.swing.JPanel; +import java.awt.Color; +import java.awt.Dimension; import java.util.ArrayList; import java.util.Map; import java.util.Set; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 超级链接 界面. * @@ -91,6 +101,19 @@ public abstract class HyperlinkGroupPane extends UIListControlPane { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_Hyperlink"); } + @Override + protected JPanel getLeftTopPane(UIToolbar topToolBar) { + return row(10, + cell(FRWidgetFactory.createLineWrapLabel(getAddItemText())), + cell(topToolBar).with(it -> { + it.setPreferredSize(FineUIScale.scale(new Dimension(160, 24))); + it.setBorderPainted(true); + it.setBorder(FineBorderFactory.createWrappedRoundBorder()); + it.setBackground(FlatUIUtils.getUIColor("fill.normal", Color.WHITE)); + }).weight(1.0) + ).getComponent(); + } + public void populate(NameJavaScriptGroup hyperlinkArray) { java.util.List list = new ArrayList<>(); if (hyperlinkArray != null) { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java index 342221fd20..8da9536f69 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java @@ -1,10 +1,15 @@ package com.fr.design.gui.frpane; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.data.impl.TreeNodeAttr; import com.fr.data.impl.TreeNodeWrapper; import com.fr.design.actions.UpdateAction; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.border.FineBorderFactory; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.controlpane.ControlPane; import com.fr.design.gui.controlpane.NameableCreator; @@ -16,21 +21,31 @@ import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.ToolBarDef; -import com.fr.form.ui.TreeEditor; import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; import com.fr.stable.Nameable; -import javax.swing.*; +import javax.swing.JPanel; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.*; -import java.awt.*; +import javax.swing.JTree; +import javax.swing.JOptionPane; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.TreeCellRenderer; +import javax.swing.tree.DefaultTreeCellRenderer; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Component; import java.awt.event.ActionEvent; import java.util.ArrayList; import java.util.List; +import static com.fine.theme.utils.FineUIScale.scale; + public class JTreeControlPane extends ControlPane { // 添加一个treeNode private AddTreeNodeAction addTreeNode; @@ -49,7 +64,7 @@ public class JTreeControlPane extends ControlPane { } private void initComponents(NameableCreator[] creators, BasicBeanPane updatePane) { - this.setLayout(new BorderLayout(2, 2)); + this.setLayout(new BorderLayout(FineUIScale.scale(10), 0)); this.updatePane = updatePane; // LeftPane JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -69,8 +84,10 @@ public class JTreeControlPane extends ControlPane { checkButtonEnabled(); } }); - tree.setPreferredSize(new Dimension(170, 350)); + tree.setPreferredSize(scale(new Dimension(170, 350))); tree.setCellRenderer(renderer); + leftPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); + FineUIStyle.setStyle(tree, FineUIStyle.PURE_TREE); // JTreeControlPane控制栏 ToolBarDef toolbarDef = new ToolBarDef(); @@ -178,7 +195,7 @@ public class JTreeControlPane extends ControlPane { this.creator = creators[0]; this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); this.setMnemonic('A'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); + this.setSmallIcon(new LazyIcon("add")); } public void actionPerformed(ActionEvent e) { @@ -209,7 +226,7 @@ public class JTreeControlPane extends ControlPane { public RemoveTreeNodeAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); this.setMnemonic('R'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); + this.setSmallIcon(new LazyIcon("remove")); } public void actionPerformed(ActionEvent e) { @@ -246,7 +263,7 @@ public class JTreeControlPane extends ControlPane { this.setText(((NameObject) userObj).getName()); } } - this.setBorder(BorderFactory.createEmptyBorder(0, 0, 2, 0)); + this.setBorder(new ScaledEmptyBorder(0, 0, 2, 0)); return this; } }; diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java index a7776e26be..24e1c79698 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java @@ -11,7 +11,6 @@ import com.fr.design.utils.gui.LayoutUtils; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingConstants; -import javax.swing.SwingWorker; import java.awt.BorderLayout; import java.awt.CardLayout; @@ -25,37 +24,25 @@ public abstract class LoadingBasicPane extends BasicPane { private CardLayout card; private JPanel container; private JProgressBar progressBar; + public LoadingBasicPane() { initCards(); initPane(); } - protected void initPane(){ - new SwingWorker() { - - @Override - protected Integer doInBackground() throws Exception { - initComponents(container); - return 0; - } - - @Override - protected void done() { - complete(); - LayoutUtils.layoutRootContainer(LoadingBasicPane.this); - card.show(LoadingBasicPane.this, "CONTAINER"); - } - - }.execute(); + protected void initPane() { + initComponents(container); + complete(); + LayoutUtils.layoutRootContainer(LoadingBasicPane.this); + card.show(LoadingBasicPane.this, "CONTAINER"); } - private void initCards() { card = new CardLayout(); setLayout(card); JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting") , SwingConstants.CENTER); + UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting"), SwingConstants.CENTER); loadingDisPane.add(loadingPane, BorderLayout.CENTER); progressBar = new JProgressBar(); progressBar.setIndeterminate(true); @@ -69,7 +56,7 @@ public abstract class LoadingBasicPane extends BasicPane { } - protected void renameConnection(String oldName,String newName){ + protected void renameConnection(String oldName, String newName) { } @@ -79,6 +66,7 @@ public abstract class LoadingBasicPane extends BasicPane { /** * 为了alphafine搜索使用，预加载面板控件，获取全部控件的信息 + * * @return */ public JPanel getAllComponents() { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java index e946ad4f94..611a5fef9b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java @@ -1,5 +1,9 @@ package com.fr.design.gui.frpane; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.editor.ValueEditorPane; @@ -19,6 +23,8 @@ import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.Iterator; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.cell; public class ObjectProperiesPane extends BasicBeanPane { private UIButton addButton; @@ -27,12 +33,13 @@ public class ObjectProperiesPane extends BasicBeanPane { public ObjectProperiesPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - + this.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property")); + this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), + new LazyIcon("add")); buttonPane.add(this.addButton, BorderLayout.WEST); - this.add(buttonPane, BorderLayout.NORTH); - + buttonPane.setPreferredSize(FineUIScale.scale(new Dimension(0, 24))); + this.addButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -43,15 +50,20 @@ public class ObjectProperiesPane extends BasicBeanPane { }); selectedItemPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); -// selectedItemPane.setLayout(new BoxLayout(selectedItemPane,BoxLayout.Y_AXIS)); - + JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); northPane.add(selectedItemPane, BorderLayout.NORTH); JScrollPane selectedItemScrollPane = new JScrollPane(); selectedItemScrollPane.setViewportView(northPane); selectedItemScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - this.add(selectedItemScrollPane, BorderLayout.CENTER); + JPanel centerPane = new JPanel(new BorderLayout()); + centerPane.setBorder(new FineRoundBorder()); + centerPane.add(selectedItemScrollPane); + this.add(column(4, + cell(buttonPane), + cell(centerPane).weight(1.0) + ).getComponent()); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java index 38e33514bc..9020e1688c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java @@ -3,23 +3,19 @@ package com.fr.design.gui.frpane; import com.fr.design.ExtraDesignClassManager; import com.fr.design.beans.ErrorMsgTextFieldAdapter; import com.fr.design.beans.UITextFieldAdapter; -import com.fr.design.constants.LayoutConstants; -import com.fr.design.designer.IntervalConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.fun.TextFieldAdapterProvider; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.TextEditor; import com.fr.form.ui.reg.NoneReg; import com.fr.form.ui.reg.RegExp; import com.fr.log.FineLoggerFactory; -import javax.swing.BorderFactory; -import javax.swing.JPanel; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fr.design.constants.LayoutConstants.LEFT_WEIGHT; +import static com.fr.design.constants.LayoutConstants.RIGHT_WEIGHT; /** * Created by kerry on 2017/9/4. @@ -37,22 +33,17 @@ public class RegFieldPane extends RegPane { } public void initComponents() { - this.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0)); regErrorMsgPane = new RegErrorMsgPane(); - final RegChangeListener regChangeListener = new RegChangeListener() { - - @Override - public void regChangeAction() { - RegExp regExp = (RegExp) getRegComboBox().getSelectedItem(); - if (regExp instanceof NoneReg) { - regErrorMsgPane.setVisible(false); - return; - } - regErrorMsgPane.setVisible(true); + final RegChangeListener regChangeListener = () -> { + RegExp regExp = (RegExp) getRegComboBox().getSelectedItem(); + if (regExp instanceof NoneReg) { + regErrorMsgPane.setVisible(false); + return; } + regErrorMsgPane.setVisible(true); }; + corePane.add(regErrorMsgPane); this.addRegChangeListener(regChangeListener); - this.add(regErrorMsgPane, BorderLayout.CENTER); } @Override @@ -80,11 +71,10 @@ public class RegFieldPane extends RegPane { private void setStyle() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip")); - tipLabel.setPreferredSize(new Dimension(60, 20)); - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, errorMsgTextFieldAdapter.getErrorMsgTextField()}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM); - this.add(panel); + this.add(row( + cell(tipLabel).weight(LEFT_WEIGHT), cell(errorMsgTextFieldAdapter.getErrorMsgTextField()).weight(RIGHT_WEIGHT) + ).getComponent()); } private void initRegErrorMsgField() { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java index ea92ee73ce..e378100567 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java @@ -1,16 +1,14 @@ package com.fr.design.gui.frpane; import com.fr.design.constants.LayoutConstants; -import com.fr.design.designer.IntervalConstants; import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.core.ReactiveCardPane; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.reg.*; import com.fr.general.ComparatorUtils; @@ -18,13 +16,14 @@ import com.fr.stable.StringUtils; import javax.swing.*; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; import java.util.EventListener; import java.util.EventObject; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; + public class RegPane extends BasicPane { public static final RegExp[] ALL_REG_TYPE = { new NoneReg(), @@ -54,7 +53,7 @@ public class RegPane extends BasicPane { private RegPhonePane regPhonePane; private DefaultRegPane defaultRegPane; private CustomRegRexPane customRegRexPane; - + protected JPanel corePane; public UIComboBox getRegComboBox(){ return regComboBox; @@ -71,49 +70,51 @@ public class RegPane extends BasicPane { private void initComponents(){ this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + corePane = column(LayoutConstants.VERTICAL_GAP).getComponent(); + this.add(corePane); + regComboBox = new UIComboBox(regType); regComboBox.setRenderer(listCellRender); - JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); - JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - - jPanel.add(contentPane, BorderLayout.NORTH); - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - final JPanel cardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); - detailedCardLayout = new CardLayout(); - cardPane.setLayout(detailedCardLayout); - cardPane.add((defaultRegPane = new DefaultRegPane()), "Default"); - cardPane.add((regLengthPane = new RegLengthPane()), "Length"); - cardPane.add((regPhonePane = new RegPhonePane()), "Phone"); - cardPane.add((customRegRexPane = new CustomRegRexPane()), "Custom"); - centerPane.add(cardPane, BorderLayout.NORTH); - jPanel.add(centerPane, BorderLayout.CENTER); - this.add(jPanel, BorderLayout.NORTH); - regComboBox.addActionListener(new ActionListener(){ - public void actionPerformed(ActionEvent e) { - RegExp regExp = (RegExp)regComboBox.getSelectedItem(); - if(regExp instanceof PhoneReg) { - cardPane.setPreferredSize(new Dimension(220, 30)); - Object selectItem = regPhonePane.dataTypeComboBox.getSelectedItem(); - String regString = selectItem == null ? StringUtils.EMPTY : selectItem.toString(); - firePhoneRegAction(regString); - detailedCardLayout.show(cardPane, "Phone"); + JPanel comboPane = row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule"))).weight(1.2), + cell(regComboBox).weight(3) + ).getComponent(); + + defaultRegPane = new DefaultRegPane(); + regLengthPane = new RegLengthPane(); + regPhonePane = new RegPhonePane(); + customRegRexPane = new CustomRegRexPane(); + + final ReactiveCardPane cardPane = ReactiveCardPane.create() + .addSupplier("Length", () -> regLengthPane) + .addSupplier("Phone", () -> regPhonePane) + .addSupplier("Custom", () -> customRegRexPane); + cardPane.setVisible(false); + + corePane.add(comboPane); + corePane.add(cardPane); + initComboListener(cardPane); + } + + private void initComboListener(ReactiveCardPane cardPane) { + regComboBox.addActionListener(e -> { + RegExp regExp = (RegExp)regComboBox.getSelectedItem(); + if(regExp instanceof PhoneReg) { + Object selectItem = regPhonePane.dataTypeComboBox.getSelectedItem(); + String regString = selectItem == null ? StringUtils.EMPTY : selectItem.toString(); + firePhoneRegAction(regString); + cardPane.select("Phone").populate(); + } else { + if (regExp instanceof LengthReg){ + cardPane.select("Length").populate(); + } else if (regExp instanceof CustomReg){ + cardPane.select("Custom").populate(); } else { - if (regExp instanceof LengthReg){ - cardPane.setPreferredSize(new Dimension(220, 60)); - detailedCardLayout.show(cardPane, "Length"); - } else if (regExp instanceof CustomReg){ - cardPane.setPreferredSize(new Dimension(220, 30)); - detailedCardLayout.show(cardPane, "Custom"); - } else { - cardPane.setPreferredSize(new Dimension(0,0 )); - detailedCardLayout.show(cardPane, "Default"); - } + cardPane.setVisible(false); } - fireRegChangeAction(); } + fireRegChangeAction(); }); } @@ -174,16 +175,24 @@ public class RegPane extends BasicPane { public abstract void populate(RegExp regRex); public abstract RegExp update(); + + public DisplayPane() { + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.add(createContentPane(), BorderLayout.CENTER); + } + + protected JPanel createContentPane() { + return new JPanel(); + } } private static class DefaultRegPane extends DisplayPane { public RegExp regRex; public DefaultRegPane(){ - + this.setVisible(false); } - @Override protected String title4PopupWindow() { return "Default"; @@ -328,38 +337,40 @@ public class RegPane extends BasicPane { private static final String EMB_REG3 = "025 85679591"; private static final int LIMIT_LENGTH = 20; private static final String REG_PATTERN = "0123456789-*# "; + private static final int CUSTOM_OPTION_INDEX = 3; private UIComboBox dataTypeComboBox; - private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")}; - DefaultComboBoxModel DefaultComboBoxModel= new DefaultComboBoxModel(dataType); - public RegPhonePane() { - this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - dataTypeComboBox = new UIComboBox(DefaultComboBoxModel); + private DefaultComboBoxModel defaultComboBoxModel; + + @Override + protected JPanel createContentPane() { + String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")}; + defaultComboBoxModel = new DefaultComboBoxModel(dataType); + dataTypeComboBox = new UIComboBox(defaultComboBoxModel); JTextField editFiled = (JTextField)(dataTypeComboBox.getEditor().getEditorComponent()); - UILabel dataTypeLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data_Type")); - dataTypeLable.setPreferredSize(new Dimension(60, 20)); - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{dataTypeLable, dataTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, 0); - this.add(panel); + UILabel dataTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data_Type")); + editFiled.setDocument(new LimitedDocument(LIMIT_LENGTH, REG_PATTERN)); - dataTypeComboBox.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - if(e.getStateChange() == ItemEvent.SELECTED) { - if(ComparatorUtils.equals(e.getItem(), dataType[3])) { - dataTypeComboBox.setSelectedItem(null); - dataTypeComboBox.setEditable(true); - firePhoneRegAction(EMB_REG1); - } else { - dataTypeComboBox.setEditable(false); - firePhoneRegAction(dataTypeComboBox.getSelectedItem().toString()); - } + dataTypeComboBox.addItemListener(e -> { + if(e.getStateChange() == ItemEvent.SELECTED) { + if(ComparatorUtils.equals(e.getItem(), dataType[CUSTOM_OPTION_INDEX])) { + dataTypeComboBox.setSelectedItem(null); + dataTypeComboBox.setEditable(true); + firePhoneRegAction(EMB_REG1); + } else { + dataTypeComboBox.setEditable(false); + firePhoneRegAction(dataTypeComboBox.getSelectedItem().toString()); } } }); dataTypeComboBox.setSelectedIndex(0); firePhoneRegAction(dataTypeComboBox.getSelectedItem().toString()); + + return row( + cell(dataTypeLabel).weight(1.2), cell(dataTypeComboBox).weight(3) + ).getComponent(); } + @Override protected String title4PopupWindow() { return "PHONE"; @@ -372,7 +383,7 @@ public class RegPane extends BasicPane { } String regstr = ((PhoneReg)regRex).getRegString(); if (checkEmbedded(regstr)){ - DefaultComboBoxModel.addElement(regstr); + defaultComboBoxModel.addElement(regstr); } dataTypeComboBox.setSelectedItem(((PhoneReg)regRex).getRegString()); } @@ -394,34 +405,21 @@ public class RegPane extends BasicPane { private static class RegLengthPane extends DisplayPane { private UISpinner minLenSpinner; private UISpinner maxLenSpinner; - private final int DEFAULT_WIDTH = 60; - public RegLengthPane(){ - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); - this.setPreferredSize(new Dimension(210, 56)); + @Override + protected JPanel createContentPane() { minLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); maxLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); UILabel minLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Min_Length")); UILabel maxLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Max_Length")); - int minLabelWidth = Math.max(minLabel.getPreferredSize().width, DEFAULT_WIDTH); - int maxLabelWidth = Math.max(maxLabel.getPreferredSize().width, DEFAULT_WIDTH); - - minLabel.setPreferredSize(new Dimension(minLabelWidth, 20)); - maxLabel.setPreferredSize(new Dimension(maxLabelWidth, 20)); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - Component[][] components = new Component[][]{ - new Component[]{minLabel, minLenSpinner }, - new Component[]{maxLabel, maxLenSpinner}, - }; - double[] rowSize = {p, p}; - double[] columnSize = {p,f}; - int[][] rowCount = {{1, 1},{1, 1}}; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, LayoutConstants.VGAP_MEDIUM); - this.add(panel); - - + return column(LayoutConstants.VERTICAL_GAP, + row( + cell(minLabel).weight(1.2), cell(minLenSpinner).weight(3) + ), + row( + cell(maxLabel).weight(1.2), cell(maxLenSpinner).weight(3) + ) + ).getComponent(); } @Override @@ -453,15 +451,16 @@ public class RegPane extends BasicPane { } } - private static class CustomRegRexPane extends DisplayPane{ + private static class CustomRegRexPane extends DisplayPane { private UITextField regTextField; - public CustomRegRexPane(){ - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); + @Override + protected JPanel createContentPane() { regTextField = new UITextField(); - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM); - this.add(panel); + return row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Expressions"))).weight(1.2), + cell(regTextField).weight(3) + ).getComponent(); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java index 37bd82bfc5..4cc08c6a6c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java @@ -16,6 +16,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.ParameterProvider; +import javax.swing.JPanel; import javax.swing.event.TableModelListener; import java.awt.*; import java.util.List; @@ -41,15 +42,26 @@ public class ReportletParameterViewPane extends BasicPane { public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType) { this(actions, useParaType, ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType), - ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType)); + ValueEditorPaneFactory.createVallueEditorPaneWithUseType(useParaType), null); } public ReportletParameterViewPane(int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { - this(null, useParaType, valueEditorPane, valueRenderPane); + this(null, useParaType, valueEditorPane, valueRenderPane, null); } - public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { - this.initComponent(actions, useParaType, valueEditorPane, valueRenderPane); + public ReportletParameterViewPane(int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane, + JPanel otherPane) { + this(null, useParaType, valueEditorPane, valueRenderPane, otherPane); + } + + public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, + ValueEditorPane valueRenderPane) { + this.initComponent(actions, useParaType, valueEditorPane, valueRenderPane, null); + } + + public ReportletParameterViewPane(UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, + ValueEditorPane valueRenderPane, JPanel otherPane) { + this.initComponent(actions, useParaType, valueEditorPane, valueRenderPane, otherPane); } /** @@ -58,7 +70,8 @@ public class ReportletParameterViewPane extends BasicPane { * @param actions Chart的热点链接actions * @param useParaType 类型 */ - public void initComponent(final UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane) { + public void initComponent(final UITableEditAction[] actions, int useParaType, ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane, + JPanel otherPanel) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (useParaType != ParameterTableModel.NO_CHART_USE) { @@ -70,14 +83,14 @@ public class ReportletParameterViewPane extends BasicPane { return (UITableEditAction[]) ArrayUtils.addAll(tableEditActions, actions); } }; - editorPane = new UITableEditorPane(model); + editorPane = new UITableEditorPane(model, otherPanel); } else { editorPane = new UITableEditorPane(new ParameterTableModel() { @Override public UITableEditAction[] createAction() { return (UITableEditAction[]) ArrayUtils.addAll(super.createAction(), actions); } - }); + }, otherPanel); } this.add(editorPane, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java index b187a8bfa0..25e0f44b37 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java @@ -1,7 +1,7 @@ package com.fr.design.gui.frpane; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.impl.TableDataDictionary; -import com.fr.data.impl.TreeAttr; import com.fr.data.impl.TreeNodeAttr; import com.fr.data.impl.TreeNodeWrapper; import com.fr.design.data.DataCreatorUI; @@ -13,17 +13,18 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itree.refreshabletree.TreeDataCardPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.form.ui.TreeComboBoxEditor; -import com.fr.form.ui.TreeEditor; import com.fr.form.ui.tree.LayerConfig; import com.fr.general.NameObject; -import javax.swing.*; -import java.awt.*; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.util.Arrays; +import javax.swing.JPanel; +import javax.swing.JComponent; +import java.awt.BorderLayout; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; public class TreeSettingPane extends BasicPane implements DataCreatorUI { /** @@ -58,19 +59,18 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { private void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel buildWayPanel = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); - buildWayPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - UILabel buildWayLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Way") + " ："); - buildWayPanel.add(buildWayLabel); + UILabel buildWayLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Way")); buildBox = new UIComboBox(buildWay); buildBox.addItemListener(e -> { cardChanged(buildBox.getSelectedIndex()); }); - buildWayPanel.add(buildBox); + buildWayPanel.add(row(20, cell(buildWayLabel), cell(buildBox).with(it -> it.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX))).getComponent()); controlPane = new JTreeControlPane(new NameableCreator[]{treeNode}, new TreeDataCardPane()); autoBuildPane = new JTreeAutoBuildPane(); layerDataControlPane = new LayerDataControlPane(); + buildWayPanel.setBorder(new ScaledEmptyBorder(0, 0, 10, 0)); this.add(buildWayPanel, BorderLayout.NORTH); cardChanged(0); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java index e501401217..eba2ce53bd 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java @@ -1,5 +1,7 @@ package com.fr.design.gui.frpane; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.SystemInfo; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.UIDialog; import com.fr.design.utils.AWTUtilities; @@ -326,27 +328,7 @@ public abstract class UIBubbleFloatPane extends BasicBeanPane { final JPanel contentPane = (JPanel) this.getContentPane(); this.setLayout(null); contentPane.add(UIBubbleFloatPane.this); - contentPane.setBorder(new Border() { - @Override - public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { - Graphics2D g2d = (Graphics2D) g; - Stroke oldStroke = g2d.getStroke(); - g2d.setStroke(new BasicStroke(2, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); - g2d.setColor(new Color(51, 51, 51)); - g2d.drawPolygon((Polygon) getShape4Board()); - g2d.setStroke(oldStroke); - } - - @Override - public Insets getBorderInsets(Component c) { - return null; - } - - @Override - public boolean isBorderOpaque() { - return false; - } - }); + setContentBorder(contentPane); } /** @@ -355,5 +337,33 @@ public abstract class UIBubbleFloatPane extends BasicBeanPane { public void checkValid() throws Exception { } + + private void setContentBorder(JPanel contentPane) { + if (SystemInfo.isWindows) { + contentPane.setBorder(new Border() { + @Override + public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { + Graphics2D g2d = (Graphics2D) g; + Stroke oldStroke = g2d.getStroke(); + g2d.setStroke(new BasicStroke(2, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND)); + g2d.setColor(FineUIUtils.getUIColor("Label.borderColor", "Label.borderColor")); + g2d.drawPolygon((Polygon) getShape4Board()); + g2d.setStroke(oldStroke); + } + + @Override + public Insets getBorderInsets(Component c) { + return null; + } + + @Override + public boolean isBorderOpaque() { + return false; + } + }); + } else { + contentPane.setBorder(null); + } + } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UIComboBoxPane.java index de8a10b1cc..24c46449e8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UIComboBoxPane.java @@ -1,7 +1,9 @@ package com.fr.design.gui.frpane; +import com.fine.theme.utils.FineUIScale; import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane; +import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.icombobox.UIComboBox; import javax.swing.*; @@ -92,7 +94,7 @@ public abstract class UIComboBoxPane extends BasicBeanPane { * august　如果需要的布局有变化，覆盖之 */ protected void initLayout() { - this.setLayout(new BorderLayout(0, 6)); + this.setLayout(new BorderLayout(0, FineUIScale.scale(LayoutConstants.VERTICAL_GAP))); JPanel northPane = new JPanel(new BorderLayout()); northPane.add(jcb, BorderLayout.CENTER); this.add(northPane, BorderLayout.NORTH); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java index 79dece5057..ac94b82499 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java @@ -1,8 +1,7 @@ package com.fr.design.gui.frpane; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.constants.UIConstants; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionListener; import com.fr.design.dialog.UIDialog; @@ -225,9 +224,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { } protected void initAddButton() { - addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); - addButton.setBorderType(UIButton.OTHER_BORDER); - addButton.setOtherBorder(UIConstants.BS, UIConstants.LINE_COLOR); + addButton = new UIButton(new LazyIcon("add")); } private void initAddButtonListener() { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java index 3a23a478c3..469540c817 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java @@ -1,26 +1,27 @@ package com.fr.design.gui.frpane; import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; +import java.awt.Color; import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.GridLayout; -import java.awt.LayoutManager; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; +import javax.swing.BorderFactory; import javax.swing.JFrame; import javax.swing.JPanel; +import javax.swing.border.LineBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.table.TableCellEditor; -import com.fr.base.BaseUtils; -import com.fr.design.constants.UIConstants; +import com.fine.swing.ui.layout.Column; +import com.fine.swing.ui.layout.Layouts; +import com.fine.swing.ui.layout.Row; +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButton; @@ -32,12 +33,15 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.utils.gui.GUICoreUtils; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.theme.utils.FineUIScale.scale; + /** * @author jerry */ public class UICorrelationPane extends JPanel implements UIObserver { - private static int size = 20; protected UIButton addButton; protected UITable tablePane; protected int columnCount; @@ -45,7 +49,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { private HeaderPane header; /** - * @param 标题栏的名字，length代表列数 + * @param names 标题栏的名字，length代表列数 */ public UICorrelationPane(String... names) { columnCount = names.length; @@ -74,12 +78,13 @@ public class UICorrelationPane extends JPanel implements UIObserver { addButton.setVisible(false); } - protected boolean isDeletable(){ + protected boolean isDeletable() { return true; } /** * 添加按钮 等 是否可用 + * * @param use 是否可用 */ public void checkBoxUse(boolean use) { @@ -116,7 +121,8 @@ public class UICorrelationPane extends JPanel implements UIObserver { /** - *添加一行 + * 添加一行 + * * @param line 行 */ public void addLine(Object[] line) { @@ -125,6 +131,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { /** * 删除某行内容 + * * @param rowIndex 行号 */ public void removeLine(int rowIndex) { @@ -139,22 +146,26 @@ public class UICorrelationPane extends JPanel implements UIObserver { @Override public void actionPerformed(ActionEvent e) { tablePane.addBlankLine(); + tablePane.doParentRepaintEvent(); fireTargetChanged(); } }; } protected void initLayout() { - this.setLayout(new Layout()); - this.add(addButton); - if (header != null) { - this.add(header); - } - this.add(tablePane); + this.setLayout(new BorderLayout(0, scale(4))); + Column tableContent = column( + cell(header), cell(tablePane).weight(1).with(it -> + it.setBorder(BorderFactory.createMatteBorder(0, 1, 1, 1, + FlatUIUtils.getUIColor("defaultBorderColor", Color.BLACK) + ))) + ).getComponent(); + this.add(column(4, cell(tableContent), cell(addButton)).getComponent()); } protected void initComponents() { tablePane = initUITable(); + tablePane.setShowVerticalLines(false); initAddButton(); } @@ -183,6 +194,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { /** * 停止面板编辑 + * * @param e 事件 */ public void stopPaneEditing(ChangeEvent e) { @@ -191,6 +203,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { /** * 创建table编辑器 + * * @return 编辑器 */ public UITableEditor createUITableEditor() { @@ -212,13 +225,11 @@ public class UICorrelationPane extends JPanel implements UIObserver { } protected void initAddButton() { - addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")) { + addButton = new UIButton(new LazyIcon("add")) { public boolean shouldResponseChangeListener() { return false; } }; - addButton.setBorderType(UIButton.OTHER_BORDER); - addButton.setOtherBorder(UIConstants.BS, UIConstants.LINE_COLOR); addButton.addActionListener(getAddButtonListener()); } @@ -233,112 +244,42 @@ public class UICorrelationPane extends JPanel implements UIObserver { } /** - * 给组件登记一个观察者监听事件 - * - * @param listener 观察者监听事件 - */ + * 给组件登记一个观察者监听事件 + * + * @param listener 观察者监听事件 + */ public void registerChangeListener(UIObserverListener listener) { uiObserverListener = listener; } /** - * 组件是否需要响应添加的观察者事件 - * - * @return 如果需要响应观察者事件则返回true，否则返回false - */ + * 组件是否需要响应添加的观察者事件 + * + * @return 如果需要响应观察者事件则返回true，否则返回false + */ public boolean shouldResponseChangeListener() { return true; } - public class Layout implements LayoutManager { - - /** - * 增加组件 - * @param name 组件名 - * @param comp 组件 - */ - public void addLayoutComponent(String name, Component comp) { - - } - - /** - *移除组件 - * @param comp 组件 - */ - public void removeLayoutComponent(Component comp) { - - } - - /** - *最佳大小 - * @param parent 父容器 - * @return 大小 - */ - public Dimension preferredLayoutSize(Container parent) { - int h = addButton.getPreferredSize().height + tablePane.getPreferredSize().height; - if (header != null) { - h = header.getPreferredSize().height; - } - return new Dimension(parent.getWidth(), h + 2); - } - - /** - * 最小布局大小 - * @param parent 父容器 - * @return 大小 - */ - public Dimension minimumLayoutSize(Container parent) { - return preferredLayoutSize(parent); - } - - /** - * 布局容器 - * @param parent 父容器 - */ - public void layoutContainer(Container parent) { - int width = parent.getWidth(); - int y = 0; - if (header != null) { - header.setBounds(0, y, width - (isDeletable() ?size:0), header.getPreferredSize().height); - y = y + header.getPreferredSize().height; - } - tablePane.setBounds(0, y, width+(isDeletable() ?0:size), tablePane.getPreferredSize().height); - y += tablePane.getPreferredSize().height + 2; - addButton.setBounds(0, y, width, addButton.getPreferredSize().height); - } - } - - private class HeaderPane extends JPanel { + private static class HeaderPane extends Row { public HeaderPane(String[] names) { UILabel[] labels = new UILabel[names.length]; - this.setLayout(new GridLayout(0, names.length)); for (int i = 0; i < names.length; i++) { - labels[i] = new UILabel(names[i], UILabel.CENTER) { - @Override - public void paint(Graphics g) { - super.paint(g); - int width = getWidth(); - int height = getHeight(); - Graphics2D g2d = (Graphics2D) g; - g2d.setColor(UIConstants.LINE_COLOR); - g2d.drawLine(4, height - 1, width - 4, height - 1); - } - - }; - this.add(labels[i]); + labels[i] = new UILabel(names[i], UILabel.LEFT); + Layouts.populate(this, cell(labels[i]).weight(1)); } - } - - @Override - public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width - (isDeletable() ?size:0), size); + setBorder(BorderFactory.createCompoundBorder( + new LineBorder(FlatUIUtils.getUIColor("defaultBorderColor", Color.BLACK)), + new ScaledEmptyBorder(6, 6, 6, 6) + )); } } /** * 增加监听 + * * @param l 监听 */ public void addChangeListener(ChangeListener l) { @@ -347,6 +288,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { /** * 移除监听 + * * @param l 监听 */ public void removeChangeListener(ChangeListener l) { @@ -368,7 +310,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { public Dimension getPreferredSize() { Dimension dim = new Dimension(); dim.width = super.getPreferredSize().width; - dim.height = addButton.getPreferredSize().height + tablePane.getPreferredSize().height + 2; + dim.height = addButton.getPreferredSize().height + tablePane.getPreferredSize().height + scale(6); if (header != null) { dim.height += header.getPreferredSize().height; } @@ -382,6 +324,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { /** * 主函数 + * * @param args 参数 */ public static void main(String... args) { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java index 7314025724..053b5a56d6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java @@ -1,23 +1,26 @@ package com.fr.design.gui.frpane; +import com.fine.swing.ui.layout.Layouts; import com.fr.design.beans.BasicBeanPane; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; +import com.fr.design.gui.islider.UISlider; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.design.gui.style.NumberDragBar; -import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.BorderLayout; import java.awt.Dimension; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; + public class UINumberDragPane extends BasicBeanPane implements GlobalNameObserver { private static final long serialVersionUID = -8681716725163358249L; - private NumberDragBar dragBar; + private UISlider dragBar; private UISpinner spinner; private boolean isEditing = false; - private String numberDargPaneName = ""; + private String numberDragPaneName = ""; private GlobalNameListener globalNameListener = null; /** @@ -33,34 +36,31 @@ public class UINumberDragPane extends BasicBeanPane implements GlobalNam } public UINumberDragPane(double minValue, double maxValue, double dierta) { - dragBar = new NumberDragBar((int) minValue, (int) maxValue); + dragBar = new UISlider((int) minValue, (int) maxValue); + dragBar.setPaintLabels(true); + dragBar.setMajorTickSpacing((int) maxValue); spinner = createUISpinner(minValue, maxValue, dierta); spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")); - this.setLayout(new BorderLayout(4, 0)); - this.add(spinner, BorderLayout.EAST); - this.add(dragBar, BorderLayout.CENTER); - dragBar.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - if (globalNameListener != null && shouldResponseNameListener()) { - globalNameListener.setGlobalName(numberDargPaneName); - } - spinner.setValue(dragBar.getValue()); - if (isEditing) { - userEvent(updateBean()); - } + this.setLayout(new BorderLayout()); + this.add(Layouts.row( + cell(dragBar).weight(0.7), flex(0.1), cell(spinner).weight(0.7) + ).getComponent()); + dragBar.addChangeListener(e -> { + if (globalNameListener != null && shouldResponseNameListener()) { + globalNameListener.setGlobalName(numberDragPaneName); + } + spinner.setValue(dragBar.getValue()); + if (isEditing) { + userEvent(updateBean()); } }); - spinner.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - if (globalNameListener != null && shouldResponseNameListener()) { - globalNameListener.setGlobalName(numberDargPaneName); - } - dragBar.setValue((int) spinner.getValue()); - if (isEditing) { - userEvent(updateBean()); - } + spinner.addChangeListener(e -> { + if (globalNameListener != null && shouldResponseNameListener()) { + globalNameListener.setGlobalName(numberDragPaneName); + } + dragBar.setValue((int) spinner.getValue()); + if (isEditing) { + userEvent(updateBean()); } }); } @@ -91,7 +91,7 @@ public class UINumberDragPane extends BasicBeanPane implements GlobalNam * @param name */ public void setGlobalName(String name) { - numberDargPaneName = name; + numberDragPaneName = name; } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java index 27cff9c5e3..1211c76372 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java @@ -3,10 +3,11 @@ package com.fr.design.gui.frpane; import com.fr.design.dialog.FineJOptionPane; import com.fr.general.ComparatorUtils; - -import javax.swing.*; -import javax.swing.plaf.TabbedPaneUI; -import java.awt.*; +import javax.swing.JOptionPane; +import javax.swing.JTabbedPane; +import javax.swing.SwingUtilities; +import java.awt.Color; +import java.awt.Component; /** * Created by IntelliJ IDEA. @@ -105,21 +106,21 @@ public class UITabbedPane extends JTabbedPane{ repaint(); } - @Override - /** - * 获取UI对象 - */ - public TabbedPaneUI getUI(){ - return new UITabbedPaneUI(); - } - - @Override - /** - * 更新UI - */ - public void updateUI() { - setUI(getUI()); - } +// @Override +// /** +// * 获取UI对象 +// */ +// public TabbedPaneUI getUI(){ +// return new UITabbedPaneUI(); +// } +// +// @Override +// /** +// * 更新UI +// */ +// public void updateUI() { +// setUI(getUI()); +// } /** * 删除tab，不能直接复写removeTabAt diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java index d31107c2ce..edbcd25c88 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPaneUI.java @@ -313,7 +313,7 @@ public class UITabbedPaneUI extends BasicTabbedPaneUI { h -= (y - insets.top); } drawUIContentBorder(g, x, y, w, h); - if (((UITabbedPane) tabPane).isClosable()) { + if (tabPane instanceof UITabbedPane && ((UITabbedPane) tabPane).isClosable()) { drawUITabAddBtn(g, tabPlacement, x, y, w, h); } super.paint(g, c); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java index 1bf9d604fc..56976414f6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java @@ -1,7 +1,12 @@ package com.fr.design.gui.frpane.tree.layer.config; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; +import com.fr.design.border.FineBorderFactory; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.controlpane.ControlPane; import com.fr.design.gui.icontainer.UIScrollPane; @@ -14,14 +19,25 @@ import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; -import javax.swing.*; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.*; -import java.awt.*; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeCellRenderer; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeCellRenderer; +import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.util.ArrayList; +import static com.fine.theme.utils.FineUIScale.scale; + /** * Created by juhaoyu on 16/9/21. */ @@ -43,7 +59,7 @@ public class LayerDataControlPane extends ControlPane { public LayerDataControlPane() { - this.setLayout(new BorderLayout(2, 2)); + this.setLayout(new BorderLayout(FineUIScale.scale(10), 0)); //创建层编辑panel configPane = new LayerDataConfigPane(); //创建树结构及树控件 @@ -57,7 +73,7 @@ public class LayerDataControlPane extends ControlPane { tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); leftPane.add(new UIScrollPane(tree), BorderLayout.CENTER); - tree.setPreferredSize(new Dimension(170, 350)); + tree.setPreferredSize(scale(new Dimension(170, 350))); tree.setCellRenderer(renderer); tree.addTreeSelectionListener(new TreeSelectionListener() { @@ -69,6 +85,7 @@ public class LayerDataControlPane extends ControlPane { checkButtonEnabled(); } }); + FineUIStyle.setStyle(tree, FineUIStyle.PURE_TREE); // JTreeControlPane控制栏 @@ -78,7 +95,7 @@ public class LayerDataControlPane extends ControlPane { UIToolbar toolBar = ToolBarDef.createJToolBar(); toolbarDef.updateToolBar(toolBar); leftPane.add(toolBar, BorderLayout.NORTH); - + leftPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); this.add(leftPane, BorderLayout.WEST); this.add(this.configPane, BorderLayout.CENTER); @@ -121,7 +138,7 @@ public class LayerDataControlPane extends ControlPane { this.setText(((NameObject) userObj).getName()); } } - this.setBorder(BorderFactory.createEmptyBorder(0, 0, 2, 0)); + this.setBorder(new ScaledEmptyBorder(0, 0, 2, 0)); return this; } }; @@ -146,7 +163,7 @@ public class LayerDataControlPane extends ControlPane { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); this.setMnemonic('A'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); + this.setSmallIcon(new LazyIcon("add")); } public void actionPerformed(ActionEvent e) { @@ -173,7 +190,7 @@ public class LayerDataControlPane extends ControlPane { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); this.setMnemonic('R'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); + this.setSmallIcon(new LazyIcon("remove")); } public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/FiveButtonLayout.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/FiveButtonLayout.java deleted file mode 100644 index 8932361d1e..0000000000 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/FiveButtonLayout.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.fr.design.gui.ibutton; - -import java.awt.*; - -/** - * Created with IntelliJ IDEA. - * User: pony - * Date: 13-5-27 - * Time: 下午4:51 - * To change this template use File | Settings | File Templates. - */ -public class FiveButtonLayout extends GridLayout { - private static final double SECOND_ROW = 1.25; - - public FiveButtonLayout(int rows) { - super(rows, 3, 1, 1); - } - - /** - * 容器布局 - * - * @param parent 容器 - */ - public void layoutContainer(Container parent) { - synchronized (parent.getTreeLock()) { - Insets insets = parent.getInsets(); - int ncomponents = parent.getComponentCount(); - int nrows = 2; - int ncols = 3; - if (ncomponents == 3) { - nrows = 1; - ncols = 3; - } - - if (ncomponents == 0) { - return; - } - if (nrows > 0) { - ncols = (ncomponents + nrows - 1) / nrows; - } else { - nrows = (ncomponents + ncols - 1) / ncols; - } - int w = parent.getWidth() - (insets.left + insets.right); - int h = parent.getHeight() - (insets.top + insets.bottom); - w = (w - (ncols - 1)) / ncols; - h = (h - (nrows - 1)) / nrows; - for (int i = 0, x = insets.left, y = insets.top; i < ncols; i++, x += w + 1) { - parent.getComponent(i).setBounds(x, y, w, h); - } - int line2w = (int) (SECOND_ROW * w); - int secondRowCount = ncomponents - ncols; - int startx = (parent.getWidth() - line2w * secondRowCount - secondRowCount - 1) / 2; - for (int i = ncols, x = startx, y = insets.top + h + 1; i < ncomponents; i++, x += line2w + 1) { - parent.getComponent(i).setBounds(x, y, line2w, h); - } - - } - } - - -} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java index e5f2c03ff8..c54c39cb4c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java @@ -1,35 +1,34 @@ package com.fr.design.gui.ibutton; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.CellBorderStyle; -import com.fr.base.GraphHelper; import com.fr.base.svg.IconUtils; import com.fr.design.constants.UIConstants; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.core.UITextComponent; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.Constants; import com.fr.stable.StringUtils; import javax.swing.Action; import javax.swing.Icon; import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JPanel; import javax.swing.ToolTipManager; -import javax.swing.plaf.ButtonUI; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Insets; import java.awt.Shape; import java.awt.Stroke; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.geom.RoundRectangle2D; +import static com.fine.theme.utils.FineUIStyle.STYLE_PRIMARY; +import static com.fine.theme.utils.FineUIStyle.STYLE_TEXT; +import static com.fine.theme.utils.FineUIStyle.hasStyle; +import static com.fine.theme.utils.FineUIStyle.setStyle; + public class UIButton extends JButton implements UIObserver, UITextComponent { private static final int TOOLTIP_INIT_DELAY = 300; // 延迟 0.3s 显示提示文字 @@ -61,17 +60,11 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { init(); } - public UIButton(Icon icon, boolean decorate) { - this(icon); - if (!decorate) { - setContentAreaFilled(false); - setFocusPainted(false); - setBorderPainted(false); - } - } - public UIButton(Icon icon) { super(icon); + if (icon instanceof LazyIcon) { + this.setDisabledIcon(((LazyIcon) icon).disabled()); + } init(); } @@ -100,8 +93,7 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { setRolloverIcon(rollOver); setPressedIcon(pressed); setExtraPainted(false); - setBackground(null); - setForeground(UIConstants.FONT_COLOR); + setStyle(this, STYLE_TEXT); setOpaque(false); initListener(); } @@ -142,8 +134,7 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { public void set4ToolbarButton() { setNormalPainted(false); Dimension dim = getPreferredSize(); - dim.height = HEIGHT; - setBackground(null); + setStyle(this, STYLE_TEXT); setOpaque(false); setSize(dim); setBorderPaintedOnlyWhenPressed(true); @@ -151,8 +142,9 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { public void set4LargeToolbarButton() { setNormalPainted(false); - setBackground(null); + setStyle(this, STYLE_TEXT); setOpaque(false); + setBorderPainted(false); setSize(new Dimension(40, 40)); setBorderPaintedOnlyWhenPressed(true); } @@ -167,47 +159,15 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { private void init() { - setOpaque(false); - setBackground(null); setRolloverEnabled(true); initListener(); ToolTipManager.sharedInstance().setInitialDelay(TOOLTIP_INIT_DELAY); } - @Override - public ButtonUI getUI() { - return new UIButtonUI(); - } - - /** - * 更新界面 - */ - public void updateUI() { - setUI(getUI()); - } - public CellBorderStyle getBorderStyle() { return this.border; } - @Override - public Insets getInsets() { - if (getIcon() != null) { - return new Insets(0, 3, 0, 3); - } - return new Insets(0, 10, 0, 10); - } - - //@Override - public Dimension getPreferredSize() { - Dimension dim = super.getPreferredSize(); - if (isFixedHeight() || dim.height < HEIGHT) { - dim.height = HEIGHT; - } - return dim; - } - - public int getBorderType() { return borderType; } @@ -217,7 +177,6 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { borderColor = c; } - @Override protected void paintBorder(Graphics g) { @@ -243,25 +202,6 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { @Override public void paintComponent(Graphics g) { super.paintComponent(g); - Dimension size = this.getSize(); - Graphics2D g2d = (Graphics2D) g; - Stroke oldStroke = g2d.getStroke(); - if (border != null) { - g2d.setColor(border.getTopColor()); - GraphHelper.drawLine(g2d, 3, 4, size.getWidth() - 4, 4, border.getTopStyle()); - g2d.setColor(border.getLeftColor()); - GraphHelper.drawLine(g2d, 3, 4, 3, size.getHeight() - 4, border.getLeftStyle()); - g2d.setColor(border.getBottomColor()); - GraphHelper.drawLine(g2d, 3, size.getHeight() - 4, size.getWidth() - 4, size.getHeight() - 4, border.getBottomStyle()); - g2d.setColor(border.getRightColor()); - GraphHelper.drawLine(g2d, size.getWidth() - 4, 4, size.getWidth() - 4, size.getHeight() - 4, border.getRightStyle()); - } else { - GraphHelper.drawLine(g2d, 2, 4, size.getWidth() - 4, 4, Constants.LINE_NONE); - GraphHelper.drawLine(g2d, 2, 4, 2, size.getHeight() - 4, Constants.LINE_NONE); - GraphHelper.drawLine(g2d, 2, size.getHeight() - 4, size.getWidth() - 4, size.getHeight() - 4, Constants.LINE_NONE); - GraphHelper.drawLine(g2d, size.getWidth() - 4, 4, size.getWidth() - 4, size.getHeight() - 4, Constants.LINE_NONE); - } - g2d.setStroke(oldStroke); } @@ -344,8 +284,8 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { */ public void setNormalPainted(boolean isNormalPressed) { this.isNormalPainted = isNormalPressed; - if (!isNormalPressed) { - setBackground(null); + boolean primary = hasStyle(this, STYLE_PRIMARY); + if (!isNormalPainted() && !primary) { setOpaque(false); } } @@ -357,37 +297,6 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { this.isBorderPaintedOnlyWhenPressed = value; } - private boolean isFixedHeight() { - String text = this.getText(); - if (StringUtils.isEmpty(text)) { - return true; - } - // 如果允许换行，需要放开按钮高度的限制 - return !text.startsWith(""); - } - - /** - * 主函数 - * @param args 入口参数 - */ - public static void main(String... args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel) jf.getContentPane(); - content.setLayout(null); - - UIButton bb = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); - bb.setEnabled(false); - bb.setBorderType(OTHER_BORDER); - // bb.setBounds(20, 20,content.getSize().width, bb.getPreferredSize().height); - bb.setPreferredSize(new Dimension(100, 30)); - bb.setBounds(0, 0, bb.getPreferredSize().width, bb.getPreferredSize().height); - content.add(bb); - GUICoreUtils.centerWindow(jf); - jf.setSize(400, 400); - jf.setVisible(true); - } - /** * 给组件登记一个观察者监听事件 * @@ -406,7 +315,4 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { return true; } - - - } diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonGroup.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonGroup.java index bd2e8b2afb..ddb402db2d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonGroup.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonGroup.java @@ -1,43 +1,56 @@ package com.fr.design.gui.ibutton; -import com.fr.design.constants.UIConstants; +import com.fine.swing.ui.layout.Column; +import com.fine.swing.ui.layout.Row; +import com.fine.swing.ui.layout.Spacer; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; -import com.fr.design.utils.gui.UIComponentUtils; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; -import sun.swing.SwingUtilities2; -import javax.swing.*; -import javax.swing.border.Border; +import javax.swing.Icon; +import javax.swing.border.LineBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.plaf.basic.BasicHTML; -import javax.swing.text.View; -import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.awt.geom.RoundRectangle2D; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIObserver { +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.theme.utils.FineClientProperties.BUTTON_GROUP_POSITION; +import static com.fine.theme.utils.FineClientProperties.BUTTON_TYPE; +import static com.fine.theme.utils.FineClientProperties.BUTTON_TYPE_GROUP; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_INNER; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_LEFT; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_LEFT_BOTTOM; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_LEFT_TOP; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_RIGHT; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_RIGHT_BOTTOM; +import static com.fine.theme.utils.FineClientProperties.GROUP_BUTTON_POSITION_RIGHT_TOP; +import static com.fine.theme.utils.FineUIStyle.IN_TOOLBAR_GROUP; +import static com.formdev.flatlaf.FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON; + +public class UIButtonGroup extends Column implements GlobalNameObserver, UIObserver { + private static final String UI_CLASS_ID = "ButtonGroupUI"; private static final long serialVersionUID = 1L; - private static final int TEXT_LENGTH = 3; - private static final int BUTTON_SIZE = 2; - private int currentButtonSize = 0; protected List labelButtonList; + protected int totalButtonSize; protected int selectedIndex = -1; private List objectList;// 起到一个render的作用 private GlobalNameListener globalNameListener = null; private String buttonGroupName = StringUtils.EMPTY; - private boolean isToolBarComponent = false; private boolean isClick; + private int[] customCols; private UIObserverListener uiObserverListener; private boolean autoFireStateChanged = true; @@ -58,9 +71,8 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb if (!ArrayUtils.isEmpty(objects) && iconArray.length == objects.length) { this.objectList = Arrays.asList(objects); } - labelButtonList = new ArrayList(iconArray.length); - this.setLayout(getGridLayout(iconArray.length)); - this.setBorder(getGroupBorder()); + labelButtonList = new ArrayList<>(iconArray.length); + totalButtonSize = iconArray.length; for (int i = 0; i < iconArray.length; i++) { final int index = i; Icon icon = iconArray[i]; @@ -86,17 +98,22 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb return false; } }; - initButton(labelButton); + initButton(labelButton, index); } + setBorder(new FineRoundBorder()); + initLayout(getCols()); } public UIButtonGroup(Icon[][] iconArray, T[] objects) { + this(iconArray, objects, false); + } + + public UIButtonGroup(Icon[][] iconArray, T[] objects, boolean inToolbar) { if (!ArrayUtils.isEmpty(objects) && iconArray.length == objects.length) { this.objectList = Arrays.asList(objects); } - labelButtonList = new ArrayList(iconArray.length); - this.setLayout(getGridLayout(iconArray.length)); - this.setBorder(getGroupBorder()); + totalButtonSize = iconArray.length; + labelButtonList = new ArrayList<>(iconArray.length); for (int i = 0; i < iconArray.length; i++) { final int index = i; Icon[] icon = iconArray[i]; @@ -122,50 +139,19 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb return false; } }; - initButton(labelButton); - } - } - - public boolean hasClick() { - return isClick; - } - - public void setClickState(boolean changeFlag) { - isClick = changeFlag; - } - - public void setForToolBarButtonGroup(boolean isToolBarComponent) { - this.isToolBarComponent = isToolBarComponent; - if (isToolBarComponent) { - for (int i = 0; i < labelButtonList.size(); i++) { - labelButtonList.get(i).set4ToolbarButton(); - } - } - repaint(); - - } - - - /** - * setEnabled - * - * @param enabled - */ - public void setEnabled(boolean enabled) { - super.setEnabled(enabled); - for (int i = 0; i < labelButtonList.size(); i++) { - labelButtonList.get(i).setEnabled(enabled); + initButton(labelButton, index); } + setForToolBarButtonGroup(inToolbar); + initLayout(getCols(), inToolbar); } - public UIButtonGroup(String[] textArray, T[] objects) { + public UIButtonGroup(String[] textArray, T[] objects, int[] customCols) { if (!ArrayUtils.isEmpty(objects) && textArray.length == objects.length) { this.objectList = Arrays.asList(objects); } - currentButtonSize = textArray.length; - labelButtonList = new ArrayList(textArray.length); - this.setLayout(getGridLayout(textArray.length)); - this.setBorder(getGroupBorder()); + this.customCols = customCols; + labelButtonList = new ArrayList<>(textArray.length); + totalButtonSize = textArray.length; for (int i = 0; i < textArray.length; i++) { final int index = i; final UIToggleButton labelButton = new UIToggleButton(textArray[i]) { @@ -185,77 +171,136 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb }; } - @Override - public Insets getInsets() { - return new Insets(0, 2, 0, 2); - } - public boolean shouldResponseNameListener() { return false; } }; - labelButton.setUI(new UIButtonUI() { - protected void paintText(Graphics g, AbstractButton b, String text, Rectangle textRec) { - View v = (View) b.getClientProperty(BasicHTML.propertyKey); - if (v != null) { - v.paint(g, textRec); - return; - } - FontMetrics fm = SwingUtilities2.getFontMetrics(b, g); - int mnemonicIndex = b.getDisplayedMnemonicIndex(); - if (isPressed(b)) { - g.setColor(Color.white); - } else { - g.setColor(b.isEnabled() ? Color.black : UIConstants.LINE_COLOR); - } - - SwingUtilities2.drawStringUnderlineCharAt(b, g, text, mnemonicIndex, textRec.x + getTextShiftOffset(), textRec.y + fm.getAscent() + getTextShiftOffset()); - } - }); - initButton(labelButton); + initButton(labelButton, index); } + setBorder(new FineRoundBorder()); + initLayout(getCols()); } - public void setGlobalName(String name) { - buttonGroupName = name; + public UIButtonGroup(String[] textArray, T[] objects) { + this(textArray, objects, null); } - protected void initButton(UIToggleButton labelButton) { - labelButton.setBorderPainted(false); - adjustButton(labelButton); - UIComponentUtils.setLineWrap(labelButton); - labelButtonList.add(labelButton); - this.add(labelButton); + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + + /** + * 计算按钮组的列布局;支持自定义布局 + * + * @return 列布局，形如[5,3] 即为两行，首行5个组件，次行3个组件 + */ + protected int[] getCols() { + if (customCols != null) { + return customCols; + } + return new int[]{totalButtonSize}; + } + + private void initLayout(int[] cols) { + initLayout(cols, false); } - private void adjustButton(UIToggleButton labelButton) { - if (labelButton.getText().length() > TEXT_LENGTH && currentButtonSize > BUTTON_SIZE) { - Dimension dimension = labelButton.getPreferredSize(); - dimension.height <<= 1; - labelButton.setPreferredSize(dimension); + protected void initLayout(int[] cols, boolean inToolbar) { + int currentIndex = 0; + for (int row = 0; row < cols.length; row++) { + int col = cols[row]; + Row rowContainer = new Row(); + for (int j = 0; j < col; j++) { + rowContainer.add(cell(getLabelButtonList().get(currentIndex)).weight(1.0)); + currentIndex++; + if (j != col - 1 && !inToolbar) { + rowContainer.add(createDivider()); + } + } + add(rowContainer); + if (row != cols.length - 1) { + add(createDivider()); + } } } - protected Border getGroupBorder() { - return BorderFactory.createEmptyBorder(1, 1, 1, 1); + private List getLabelButtonList() { + return labelButtonList; + } + + private Spacer createDivider() { + Spacer spacer = new Spacer(FineUIScale.scale(1)); + spacer.setBorder(new LineBorder(FineUIUtils.getUIColor("defaultBorderColor", "Component.borderColor"))); + return spacer; } - protected LayoutManager getGridLayout(int number) { - return new GridLayout(0, number, 0, 0); + protected void initButton(UIToggleButton labelButton, int index) { + labelButton.setBorderPainted(false); + labelButton.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_GROUP); + labelButton.putClientProperty(BUTTON_GROUP_POSITION, getGroupButtonPosition(index)); + labelButtonList.add(labelButton); } /** - * paintComponent + * 计算按钮位于整个按钮组件中的位置 * - * @param g + * @param index 按钮序号 + * @return 按钮位置，详见 {@link com.fine.theme.utils.FineClientProperties} */ - public void paintComponents(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - Shape oldClip = g2d.getClip(); - g2d.clip(new RoundRectangle2D.Double(1, 1, getWidth(), getHeight(), UIConstants.ARC, UIConstants.ARC)); - super.paintComponents(g); - g2d.setClip(oldClip); + protected int getGroupButtonPosition(int index) { + int[] cols = getCols(); + if (cols.length == 1) { + if (index == 0) { + return GROUP_BUTTON_POSITION_LEFT; + } else if (index == totalButtonSize - 1) { + return GROUP_BUTTON_POSITION_RIGHT; + } + } else { + int rightTopCorner = cols[0] - 1; + int leftBottomCorner = totalButtonSize - cols[cols.length - 1]; + if (index == 0) { + return GROUP_BUTTON_POSITION_LEFT_TOP; + } else if (index == totalButtonSize - 1) { + return GROUP_BUTTON_POSITION_RIGHT_BOTTOM; + } else if (index == rightTopCorner) { + return GROUP_BUTTON_POSITION_RIGHT_TOP; + } else if (index == leftBottomCorner) { + return GROUP_BUTTON_POSITION_LEFT_BOTTOM; + } + } + return GROUP_BUTTON_POSITION_INNER; + } + + public boolean hasClick() { + return isClick; + } + + public void setClickState(boolean changeFlag) { + isClick = changeFlag; + } + + private void setForToolBarButtonGroup(boolean inToolbar) { + if (inToolbar) { + for (UIToggleButton button : labelButtonList) { + button.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TOOLBAR_BUTTON); + FineUIStyle.setStyle(button, IN_TOOLBAR_GROUP); + button.setBorderPainted(false); + } + } else { + setBorder(new FineRoundBorder()); + } + } + + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + labelButtonList.forEach(b -> b.setEnabled(enabled)); + } + + public void setGlobalName(String name) { + buttonGroupName = name; } public void setAutoFireStateChanged(boolean autoFireStateChanged) { @@ -263,9 +308,9 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb } /** - * setSelectedItem + * 设置选择对象 * - * @param ob + * @param ob 选择对象 */ public void setSelectedItem(T ob) { if (objectList == null) { @@ -276,9 +321,9 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb } /** - * getSelectedItem + * 获取选择对象 * - * @return + * @return 选择对象 */ public T getSelectedItem() { if (selectedIndex == -1) { @@ -290,12 +335,18 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb /** * getSelectedIndex * - * @return + * @return 获取选中序号 */ public int getSelectedIndex() { return selectedIndex; } + /** + * 设置选中序号 + * + * @param newSelectedIndex 选中序号 + * @param fireChanged 是否联动事件 + */ public void setSelectedIndex(int newSelectedIndex, boolean fireChanged) { if (selectedIndex != newSelectedIndex) { selectedIndex = newSelectedIndex; @@ -311,7 +362,7 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb /** * setSelectedIndex * - * @param newSelectedIndex + * @param newSelectedIndex 选中序号 */ public void setSelectedIndex(int newSelectedIndex) { setSelectedIndex(newSelectedIndex, false); @@ -337,8 +388,8 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb /** * getButton * - * @param index - * @return + * @param index 序号 + * @return 按钮 */ public UIToggleButton getButton(int index) { return labelButtonList.get(index); @@ -347,7 +398,7 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb /** * 给所有的Button添加Tips * - * @param tips + * @param tips 标签 */ public void setAllToolTips(String[] tips) { for (int i = 0; i < labelButtonList.size(); i++) { @@ -355,11 +406,8 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb } } - /** * 注册全局属性名字监听器 - * - * @param listener 观察者监听事件 */ public void registerNameListener(GlobalNameListener listener) { globalNameListener = listener; @@ -367,8 +415,6 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb /** * 是否响应名字监听事件 - * - * @return */ public boolean shouldResponseNameListener() { return true; @@ -384,104 +430,41 @@ public class UIButtonGroup extends JPanel implements GlobalNameObserver, UIOb return true; } - /** - * @param l + * @param l 监听器 */ public void addChangeListener(ChangeListener l) { listenerList.add(ChangeListener.class, l); - for (int i = 0; i < labelButtonList.size(); i++) { - labelButtonList.get(i).addChangeListener(l); - } + labelButtonList.forEach(b -> b.addChangeListener(l)); } /** - * @param l + * @param l 监听器 */ public void removeChangeListener(ChangeListener l) { listenerList.remove(ChangeListener.class, l); - for (int i = 0; i < labelButtonList.size(); i++) { - labelButtonList.get(i).removeChangeListener(l); - } + labelButtonList.forEach(b -> b.removeChangeListener(l)); } - /** - * @param l + * @param l 监听器 */ public void addActionListener(ActionListener l) { - for (int i = 0; i < labelButtonList.size(); i++) { - labelButtonList.get(i).addActionListener(l); - } + labelButtonList.forEach(b -> b.addActionListener(l)); } - /** - * @param l + * @param l 监听器 */ public void removeActionListener(ActionListener l) { - for (int i = 0; i < labelButtonList.size(); i++) { - labelButtonList.get(i).removeActionListener(l); - } + labelButtonList.forEach(b -> b.removeActionListener(l)); } /** - * populate + * populate 渲染 */ public void populateBean() { fireStateChanged(); } - /** - * 重载Border画法 - * - * @param g - */ - @Override - protected void paintBorder(Graphics g) { - if (isToolBarComponent) { - return; - } - Graphics2D g2d = (Graphics2D) g; - g2d.setColor(UIConstants.SHADOW_GREY); - - int width = 0; - for (int i = 0; i < labelButtonList.size() - 1; i++) { - width += labelButtonList.get(i).getWidth() + 1; - int height = labelButtonList.get(i).getHeight(); - g.drawLine(width, 0, width, height); - } - - width += labelButtonList.get(labelButtonList.size() - 1).getWidth() + 1; - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.drawRoundRect(0, 0, width, getHeight() - 1, UIConstants.BUTTON_GROUP_ARC, UIConstants.BUTTON_GROUP_ARC); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - - } - - /** - * main - * - * @param args - */ - public static void main(String... args) { -// JFrame jf = new JFrame("test"); -// jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); -// JPanel content = (JPanel) jf.getContentPane(); -// content.setLayout(new BorderLayout()); -// Icon[] a1 = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), -// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png")}; -// Integer[] a2 = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; -// UIButtonGroup bb = new UIButtonGroup(a1, a2); -// bb.setBounds(20, 20, bb.getPreferredSize().width, bb.getPreferredSize().height); -// bb.setSelectedIndex(0); -// bb.setEnabled(false); -// content.add(bb); -// GUICoreUtils.centerWindow(jf); -// jf.setSize(400, 400); -// jf.setVisible(true); - } - - } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonUI.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonUI.java index 851ac8b513..3516acdd6d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButtonUI.java @@ -1,16 +1,32 @@ package com.fr.design.gui.ibutton; +import com.fr.base.CellBorderStyle; +import com.fr.base.GraphHelper; import com.fr.design.constants.UIConstants; import com.fr.design.roleAuthority.ReportAndFSManagePane; import com.fr.design.utils.gui.GUIPaintUtils; +import com.fr.stable.Constants; import com.fr.stable.StringUtils; import sun.swing.SwingUtilities2; -import javax.swing.*; +import javax.swing.AbstractButton; +import javax.swing.ButtonModel; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.SwingUtilities; import javax.swing.plaf.basic.BasicButtonUI; import javax.swing.plaf.basic.BasicHTML; import javax.swing.text.View; -import java.awt.*; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.Rectangle; +import java.awt.RenderingHints; +import java.awt.Stroke; + public class UIButtonUI extends BasicButtonUI { @@ -36,6 +52,26 @@ public class UIButtonUI extends BasicButtonUI { ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); paintContent(g, b, text); + + Dimension size = b.getSize(); + Stroke oldStroke = g2d.getStroke(); + CellBorderStyle border = b.getBorderStyle(); + if (border != null) { + g2d.setColor(border.getTopColor()); + GraphHelper.drawLine(g2d, 3, 4, size.getWidth() - 4, 4, border.getTopStyle()); + g2d.setColor(border.getLeftColor()); + GraphHelper.drawLine(g2d, 3, 4, 3, size.getHeight() - 4, border.getLeftStyle()); + g2d.setColor(border.getBottomColor()); + GraphHelper.drawLine(g2d, 3, size.getHeight() - 4, size.getWidth() - 4, size.getHeight() - 4, border.getBottomStyle()); + g2d.setColor(border.getRightColor()); + GraphHelper.drawLine(g2d, size.getWidth() - 4, 4, size.getWidth() - 4, size.getHeight() - 4, border.getRightStyle()); + } else { + GraphHelper.drawLine(g2d, 2, 4, size.getWidth() - 4, 4, Constants.LINE_NONE); + GraphHelper.drawLine(g2d, 2, 4, 2, size.getHeight() - 4, Constants.LINE_NONE); + GraphHelper.drawLine(g2d, 2, size.getHeight() - 4, size.getWidth() - 4, size.getHeight() - 4, Constants.LINE_NONE); + GraphHelper.drawLine(g2d, size.getWidth() - 4, 4, size.getWidth() - 4, size.getHeight() - 4, Constants.LINE_NONE); + } + g2d.setStroke(oldStroke); } protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) { @@ -46,6 +82,16 @@ public class UIButtonUI extends BasicButtonUI { } else if (b.isNormalPainted()) { GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted()); } + + if (isPressed(b) && b.isPressedPainted()) { + Color pressColor = b.isPressedPainted() ? UIConstants.TAB_BUTTON_PRESS_SELECTED : UIConstants.TAB_BUTTON_PRESS; + GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), pressColor); + } else if (isRollOver(b)) { + Color hoverColor = b.isPressedPainted() ? UIConstants.TAB_BUTTON_HOVER_SELECTED : UIConstants.TAB_BUTTON_HOVER; + GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), hoverColor); + } else if (b.isNormalPainted()) { + GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted()); + } } protected boolean isRollOver(AbstractButton b) { diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java index 31a6d963d9..0129909b08 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java @@ -1,7 +1,6 @@ package com.fr.design.gui.ibutton; -import com.fr.base.Utils; -import com.fr.design.constants.UIConstants; +import com.fine.theme.icon.LazyIcon; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; import com.fr.design.event.UIObserver; @@ -11,39 +10,38 @@ import com.fr.design.style.color.ColorControlWindow; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import javax.swing.AbstractButton; -import javax.swing.ButtonModel; import javax.swing.Icon; -import javax.swing.JComponent; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.EventListenerList; import java.awt.Color; -import java.awt.Graphics; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; public class UIColorButton extends UIButton implements PopupHider, UIObserver, GlobalNameObserver { - public static final int SIZE = 16; - public static final int SIZE_2 = 2; - public static final int SIZE_4 = 4; - public static final int SIZE_6 = 6; + + private static final String UI_CLASS_ID = "ColorButtonUI"; + private static final int POPUP_MENU_SHIFT = -70; private Color color = Color.BLACK; private ColorControlWindow popupWin; - private EventListenerList colorChangeListenerList = new EventListenerList(); + private final EventListenerList colorChangeListenerList = new EventListenerList(); private boolean isEventBanned = false; private String colorButtonName = ""; private UIObserverListener uiObserverListener; private GlobalNameListener globalNameListener = null; + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + public UIColorButton() { - this(UIConstants.FONT_ICON); + this(new LazyIcon("foreground")); } public UIColorButton(Icon icon) { super(icon); - setUI(getButtonUI()); addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { @@ -63,38 +61,18 @@ public class UIColorButton extends UIButton implements PopupHider, UIObserver, G private void iniListener() { if (shouldResponseChangeListener()) { - this.addColorChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - if (uiObserverListener == null) { - return; - } - if (globalNameListener != null && shouldResponseNameListener()) { - globalNameListener.setGlobalName(colorButtonName); - } - uiObserverListener.doChange(); + this.addColorChangeListener(e -> { + if (uiObserverListener == null) { + return; + } + if (globalNameListener != null && shouldResponseNameListener()) { + globalNameListener.setGlobalName(colorButtonName); } + uiObserverListener.doChange(); }); } } - private UIButtonUI getButtonUI() { - return new UIButtonUI() { - @Override - protected void paintIcon(Graphics g, JComponent c) { - super.paintIcon(g, c); - AbstractButton b = (AbstractButton) c; - ButtonModel model = b.getModel(); - if (model.isEnabled()) { - g.setColor(UIColorButton.this.getColor()); - } else { - g.setColor(new Color(Utils.filterRGB(UIColorButton.this.getColor().getRGB(), 50))); - } - g.fillRect((b.getWidth() - SIZE) / SIZE_2, b.getHeight() - SIZE_6, SIZE, SIZE_4); - } - }; - } - public void setEventBanned(boolean isEventBanned) { this.isEventBanned = isEventBanned; } diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java index a7dcad008a..b10b1d91f8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButtonWithAuto.java @@ -1,5 +1,6 @@ package com.fr.design.gui.ibutton; +import com.fine.theme.icon.LazyIcon; import com.fr.chart.base.ChartConstants; import com.fr.design.constants.UIConstants; import com.fr.design.style.color.ColorControlWindow; @@ -12,7 +13,7 @@ public class UIColorButtonWithAuto extends UIColorButton { protected void checkColorChange(Color oldColor, Color newColor) { if (ComparatorUtils.equals(oldColor, ChartConstants.AUTO_FONT_COLOR) && !ComparatorUtils.equals(newColor, ChartConstants.AUTO_FONT_COLOR)) { - setIcon(UIConstants.FONT_ICON); + setIcon(new LazyIcon("foreground")); } if (!ComparatorUtils.equals(oldColor, ChartConstants.AUTO_FONT_COLOR) && ComparatorUtils.equals(newColor, ChartConstants.AUTO_FONT_COLOR)) { diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java index 4a24c8de25..70f229d2a3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java @@ -1,143 +1,155 @@ package com.fr.design.gui.ibutton; -import java.awt.BorderLayout; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; +import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.Icon; -import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JPopupMenu; +import java.awt.BorderLayout; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.function.Consumer; -import com.fr.design.constants.UIConstants; -import com.fr.stable.Constants; -import com.fr.design.utils.gui.GUICoreUtils; +import static com.fine.theme.utils.FineClientProperties.BUTTON_BORDER; +import static com.fine.theme.utils.FineClientProperties.BUTTON_BORDER_LEFT_ROUND_RECT; +import static com.fine.theme.utils.FineClientProperties.BUTTON_BORDER_RIGHT_ROUND_RECT; +import static com.fine.theme.utils.FineUIStyle.IN_TOOLBAR_LEFT; +import static com.fine.theme.utils.FineUIStyle.IN_TOOLBAR_RIGHT; +import static com.fine.theme.utils.FineUIStyle.STYLE_PRIMARY; +import static com.fine.theme.utils.FineUIStyle.setStyle; +import static com.formdev.flatlaf.FlatClientProperties.BUTTON_TYPE; +import static com.formdev.flatlaf.FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON; + +/** + * 双按钮组件 + * + * @author vito + * @since 11.0 + *

+ * created by vito on 2023/12/28 + **/ +public class UICombinationButton extends JPanel { + + private static final String UI_CLASS_ID = "CombinationButtonUI"; + + protected UIButton leftButton; + protected UIButton rightButton; + + + private Consumer leftClickLister; + private Consumer rightClickLister; + + protected void leftButtonClickEvent() { + // 左边按钮点击事件 + } + + protected void rightButtonClickEvent() { + // 右边按钮点击事件 + } + + public UICombinationButton() { + this(new UIButton(), new UIButton()); + } + + + /** + * 添加左按钮监听器 + * + * @param lister 监听 + */ + public void addLeftClickLister(Consumer lister) { + this.leftClickLister = lister; + } + + /** + * 添加右按钮监听器 + * + * @param lister 监听 + */ + public void addRightClickLister(Consumer lister) { + this.rightClickLister = lister; + } + + public UICombinationButton(UIButton left, UIButton right) { + setOpaque(false); + leftButton = left; + leftButton.putClientProperty(BUTTON_BORDER, BUTTON_BORDER_LEFT_ROUND_RECT); + rightButton = right; + rightButton.putClientProperty(BUTTON_BORDER, BUTTON_BORDER_RIGHT_ROUND_RECT); + leftButton.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (leftClickLister != null) { + leftClickLister.accept(e); + } else { + leftButtonClickEvent(); + } + } + }); + rightButton.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + if (rightClickLister != null) { + rightClickLister.accept(e); + } else { + rightButtonClickEvent(); + } + } + }); + + this.setLayout(new BorderLayout()); + this.add(leftButton, BorderLayout.WEST); + this.add(rightButton, BorderLayout.EAST); + } + + public UICombinationButton(String left, Icon right) { + this(); + leftButton.setText(left); + rightButton.setIcon(right); + } + + public UICombinationButton(String left, String right) { + this(); + leftButton.setText(left); + rightButton.setText(right); + } + + public UICombinationButton(Icon left, Icon right) { + this(); + leftButton.setIcon(left); + rightButton.setIcon(right); + } + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + + public void setPrimary() { + setStyle(leftButton, STYLE_PRIMARY); + + setStyle(rightButton, STYLE_PRIMARY); + } + + public UIButton getLeftButton() { + return leftButton; + } + + public UIButton getRightButton() { + return rightButton; + } + + public void set4Toolbar() { + leftButton.setBorderPainted(false); + leftButton.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TOOLBAR_BUTTON); + setStyle(leftButton, IN_TOOLBAR_LEFT); + rightButton.setBorderPainted(false); + rightButton.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TOOLBAR_BUTTON); + setStyle(rightButton, IN_TOOLBAR_RIGHT); + } -public class UICombinationButton extends JPanel{ - protected UIButton leftButton; - protected UIButton rightButton; - - protected void leftButtonClickEvent() { - // 左边按钮点击事件 - } - - protected void rightButtonClickEvent() { - // 右边按钮点击事件 - } - - public UICombinationButton() { - this(new UIButton(), new UIButton()); - } - - public UICombinationButton(UIButton left, UIButton right) { - leftButton = left; - rightButton = right; - - leftButton.setRoundBorder(true, Constants.RIGHT); - rightButton.setRoundBorder(true, Constants.LEFT); - - leftButton.addMouseListener(new MouseAdapter() { - @Override - public void mousePressed(MouseEvent e) { - rightButton.getModel().setPressed(true); - rightButton.getModel().setSelected(true); - rightButton.repaint(); - } - - @Override - public void mouseReleased(MouseEvent e) { - rightButton.getModel().setPressed(false); - rightButton.getModel().setSelected(false); - rightButton.repaint(); - } - @Override - public void mouseClicked(MouseEvent e) { - leftButtonClickEvent(); - } - }); - rightButton.addMouseListener(new MouseAdapter() { - @Override - public void mousePressed(MouseEvent e) { - leftButton.getModel().setPressed(true); - leftButton.getModel().setSelected(true); - leftButton.repaint(); - } - - @Override - public void mouseReleased(MouseEvent e) { - leftButton.getModel().setPressed(false); - leftButton.getModel().setSelected(false); - leftButton.repaint(); - } - - @Override - public void mouseClicked(MouseEvent e) { - rightButtonClickEvent(); - } - }); - - this.setLayout(new BorderLayout()); - this.add(leftButton, BorderLayout.CENTER); - this.add(rightButton, BorderLayout.EAST); - } - - public UICombinationButton(String left, Icon right) { - this(); - leftButton.setText(left); - rightButton.setIcon(right); - } - - public UICombinationButton(String left, String right) { - this(); - leftButton.setText(left); - rightButton.setText(right); - } - - public UICombinationButton(Icon left, Icon right) { - this(); - leftButton.setIcon(left); - rightButton.setIcon(right); - } - - public UIButton getLeftButton() { - return leftButton; - } - - public void setExtraPainted(boolean isExtraPainted) { - if(!isExtraPainted) { - leftButton.setBackground(null); - rightButton.setBackground(null); - leftButton.setOpaque(false); - rightButton.setOpaque(false); - } - } - - public UIButton getRightButton() { - return rightButton; - } - - public void set4Toolbar() { - leftButton.setNormalPainted(false); - rightButton.setNormalPainted(false); - leftButton.setBorderPaintedOnlyWhenPressed(true); - rightButton.setBorderPaintedOnlyWhenPressed(true); - } - - protected void showPopWindow(JPopupMenu menu) { - GUICoreUtils.showPopupMenu(menu, this, 0, getY() + getHeight() - 3); - } - - public static void main(String... args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel)jf.getContentPane(); - content.setLayout(null); - - UICombinationButton bb = new UICombinationButton("123455", UIConstants.ARROW_DOWN_ICON); - bb.setBounds(20, 20, bb.getPreferredSize().width, bb.getPreferredSize().height); - content.add(bb); - GUICoreUtils.centerWindow(jf); - jf.setSize(400, 400); - jf.setVisible(true); - } + protected void showPopWindow(JPopupMenu menu) { + GUICoreUtils.showPopupMenu(menu, this, 0, getY() + getHeight() - 3); + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHead.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHead.java index 0a41aae172..9d52c61870 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHead.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHead.java @@ -8,36 +8,32 @@ public class UIHead { private String text = StringUtils.EMPTY; private Icon icon = null; private boolean enable = true; - private int index = 0; - public UIHead(String text, int index) { + public UIHead(String text) { this.text = text; - this.index = index; } - public UIHead(String text, int index, boolean enable) { - this(text, index); + public UIHead(String text, boolean enable) { + this(text); this.enable = enable; } - public UIHead(Icon icon, int index) { + public UIHead(Icon icon) { this.icon = icon; - this.index = index; } - public UIHead(Icon icon, int index, boolean enable) { - this(icon, index); + public UIHead(Icon icon,boolean enable) { + this(icon); this.enable = enable; } - public UIHead(String text, Icon icon, int index) { + public UIHead(String text, Icon icon) { this.text = text; this.icon = icon; - this.index = index; } - public UIHead(String text, Icon icon, int index, boolean enable) { - this(text, icon, index); + public UIHead(String text, Icon icon, boolean enable) { + this(text, icon); this.enable = enable; } @@ -57,7 +53,4 @@ public class UIHead { return enable; } - public int getIndex() { - return index; - } } diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java index 0cfe7c3903..4f6ee08cc8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java @@ -1,155 +1,158 @@ package com.fr.design.gui.ibutton; -import com.fr.base.BaseUtils; -import com.fr.design.constants.UIConstants; -import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.design.utils.gui.UIComponentUtils; +import com.fine.swing.ui.layout.Layouts; +import com.fine.swing.ui.layout.Row; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.third.guava.collect.Streams; +import javax.swing.AbstractButton; +import javax.swing.ButtonGroup; import javax.swing.Icon; -import javax.swing.JFrame; -import javax.swing.JPanel; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.GridLayout; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; +import javax.swing.JComponent; +import javax.swing.JToggleButton; +import javax.swing.UIDefaults; +import javax.swing.event.ChangeListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; -// fanglei：不是原作者，只是优化如下问题：代码冗余，无法拓展（例如我想加个enable属性没法加），甚至还有数组越界的问题。 -public class UIHeadGroup extends JPanel { - private static final int MIN_HEIGHT = 25; - private List uiHeads = new ArrayList<>(); - protected List labelButtonList; - private boolean isNeedLeftRightOutLine = true; - protected int selectedIndex = -1; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.formdev.flatlaf.FlatClientProperties.BUTTON_TYPE; +import static com.formdev.flatlaf.FlatClientProperties.BUTTON_TYPE_TAB; - protected void tabChanged(int newSelectedIndex) { - // do nothing - } +/** + * 面板头部 tab 按钮组 + * + * @author vito + * @since 11.0 + * Created on 2023/10/31 + */ +public class UIHeadGroup extends Row { + + private static final String UI_CLASS_ID = "HeadGroupUI"; + private UIHeadGroupSingleSelectionModel model; + + private List btns; + + private final ButtonGroup buttonGroup = new ButtonGroup(); public UIHeadGroup(String[] textArray) { - for (int i = 0; i < textArray.length; i++) { - uiHeads.add(new UIHead(textArray[i], i)); - } - initUIHeadGroup(uiHeads); + setModel(new UIHeadGroupSingleSelectionModel( + Arrays.stream(textArray).map(UIHead::new).collect(Collectors.toList()))); + intiContent(); } public UIHeadGroup(Icon[] iconArray) { - for (int i = 0; i < iconArray.length; i++) { - uiHeads.add(new UIHead(iconArray[i], i)); - } - initUIHeadGroup(uiHeads); + setModel(new UIHeadGroupSingleSelectionModel( + Arrays.stream(iconArray).map(UIHead::new).collect(Collectors.toList()))); + intiContent(); } - public UIHeadGroup(Icon[] iconArray, String[] textArray) { - int length = Math.min(textArray.length, iconArray.length); - for (int i = 0; i < length; i++) { - uiHeads.add(new UIHead(textArray[i], iconArray[i], i)); - } - initUIHeadGroup(uiHeads); + public UIHeadGroup(List heads) { + setModel(new UIHeadGroupSingleSelectionModel(heads)); + intiContent(); } - public UIHeadGroup(List uiHeads) { - initUIHeadGroup(uiHeads); + /** + * Returns the name of the L&F class that renders this component. + * + * @return the string "ToolTipUI" + * @see JComponent#getUIClassID + * @see UIDefaults#getUI + */ + @Override + public String getUIClassID() { + return UI_CLASS_ID; } - public void initUIHeadGroup(List uiHeads) { - if (uiHeads != null) { - labelButtonList = new ArrayList(uiHeads.size()); - this.setLayout(new GridLayout(0, uiHeads.size(), 1, 0)); - - for (UIHead head : uiHeads) { - if (head.isOnlyText()) { - this.setBackground(UIConstants.TREE_BACKGROUND); - } else { - this.setBackground(UIConstants.NORMAL_BACKGROUND); - } - initButton(createUIToggleButton(head)); - } - setSelectedIndex(0); - } + private void intiContent() { + setSpacing(2); + setOpaque(false); + add(buttonGroup()); + setSelectedIndex(0); + setBorder(new ScaledEmptyBorder(2, 2, 2, 2)); } - @Override - public Dimension getPreferredSize() { - Dimension dim = super.getPreferredSize(); - if (dim.height < MIN_HEIGHT) { - dim.height = MIN_HEIGHT; - } - return dim; + private Layouts.Cell[] buttonGroup() { + btns = new ArrayList<>(getModel().getDataList().size()); + return Streams.mapWithIndex(getModel().getDataList().stream(), + (h, index) -> cell(new JToggleButton(h.getText(), h.getIcon())) + .weight(1.0) + .with(b -> { + btns.add(b); + buttonGroup.add(b); + b.setEnabled(h.isEnable()); + b.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TAB); + b.addActionListener(e -> setSelectedIndex((int) index)); + }) + + ).toArray(Layouts.Cell[]::new); } - private void initButton(UIToggleButton labelButton) { - labelButton.setRoundBorder(false); - labelButton.setBorderPainted(false); - labelButton.setPressedPainted(false); - UIComponentUtils.setLineWrap(labelButton); - labelButtonList.add(labelButton); - this.add(labelButton); + /** + * tabChanged 时调用 + * + * @param newSelectedIndex + * @see #addChangeListener(ChangeListener) + * @deprecated 这种方式会导致使用的时候都要创建一个匿名类, 使用监听代替{@link #addChangeListener(ChangeListener)} + */ + @Deprecated + protected void tabChanged(int newSelectedIndex) { + // do nothing } - public void setSelectedIndex(int newSelectedIndex) { - selectedIndex = newSelectedIndex; - for (int i = 0; i < labelButtonList.size(); i++) { - UIToggleButton button = labelButtonList.get(i); - if (i == selectedIndex) { - button.setNormalPainted(false); - button.setBackground(new Color(240, 240, 243)); - button.setOpaque(true); - button.setSelected(true); - } else { - button.setOpaque(false); - button.setNormalPainted(true); - button.setSelected(false); - } - } + private UIHeadGroupSingleSelectionModel getModel() { + return model; + } - tabChanged(newSelectedIndex); + public void setModel(UIHeadGroupSingleSelectionModel model) { + this.model = model; } - public void setNeedLeftRightOutLine(boolean isNeedLeftRightOutLine) { - this.isNeedLeftRightOutLine = isNeedLeftRightOutLine; + /** + * 添加一个监听，在tab切换时触发 + * + * @param l 监听 + */ + public void addChangeListener(ChangeListener l) { + getModel().addChangeListener(l); } - public int getSelectedIndex() { - return selectedIndex; + /** + * 移除一个监听 + * + * @param l 监听 + */ + public void removeChangeListener(ChangeListener l) { + getModel().removeChangeListener(l); } - public UIToggleButton createUIToggleButton(final UIHead head) { - UIToggleButton uiToggleButton = new UIToggleButton(head.getText(), head.getIcon()) { - @Override - protected MouseListener getMouseListener() { - return new MouseAdapter() { - @Override - public void mousePressed(MouseEvent e) { - if (head.isEnable()) { - setSelectedIndex(head.getIndex()); - UIHeadGroup.this.repaint(); - } - } - }; - } - }; - - uiToggleButton.setEnabled(head.isEnable()); - return uiToggleButton; + /** + * 设置索引用于选中某个tab + * + * @param index 面板索引 + */ + public void setSelectedIndex(int index) { + if (!checkRange(index)) { + return; + } + buttonGroup.setSelected(btns.get(index).getModel(), true); + getModel().setSelectedIndex(index); + tabChanged(index); } - public static void main(String... args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel) jf.getContentPane(); - content.setLayout(null); - Icon[] a1 = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), - BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png")}; - UIHeadGroup bb = new UIHeadGroup(a1); - bb.setBounds(20, 20, bb.getPreferredSize().width, bb.getPreferredSize().height); - bb.setSelectedIndex(0); - content.add(bb); - GUICoreUtils.centerWindow(jf); - jf.setSize(400, 400); - jf.setVisible(true); + /** + * 获取选中tab的索引 + * + * @return 选中tab的索引 + */ + public int getSelectedIndex() { + return getModel().getSelectedIndex(); } -} \ No newline at end of file + + private boolean checkRange(int newSelectedIndex) { + return newSelectedIndex > -1 && newSelectedIndex < btns.size(); + } + +} diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroupSingleSelectionModel.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroupSingleSelectionModel.java new file mode 100644 index 0000000000..aacb6ec1fa --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroupSingleSelectionModel.java @@ -0,0 +1,31 @@ +package com.fr.design.gui.ibutton; + +import javax.swing.DefaultSingleSelectionModel; +import java.util.List; + +/** + * 头部按钮组单选模型 + * + * @author vito + * @since 11.0 + * Created on 2023/11/2 + */ +public class UIHeadGroupSingleSelectionModel extends DefaultSingleSelectionModel { + + private final List dataList; + + UIHeadGroupSingleSelectionModel(List dataList) { + this.dataList = dataList; + } + + public UIHeadGroupSingleSelectionModel set(int index, UIHead head) { + dataList.add(index, head); + return this; + } + + + public List getDataList() { + return dataList; + } + +} diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java index 7112e5d657..1b110ccfd2 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java @@ -6,7 +6,9 @@ import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.Action; +import javax.swing.Icon; +import javax.swing.JRadioButton; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -18,6 +20,8 @@ import java.awt.event.ItemListener; * Time: 下午5:04 */ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNameObserver { + + private UIObserverListener uiObserverListener; private GlobalNameListener globalNameListener = null; private String radioButtonName = StringUtils.EMPTY; @@ -137,6 +141,7 @@ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNam /** * 注册观察者监听事件 + * * @param listener 观察者监听事件 */ public void registerNameListener(GlobalNameListener listener) { @@ -144,7 +149,8 @@ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNam } /** - * 组件是否需要响应观察者事件 + * 组件是否需要响应观察者事件 + * * @return 如果需要响应观察者事件则返回true，否则返回false */ public boolean shouldResponseNameListener() { diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UITabGroup.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UITabGroup.java index 12ca005249..5352ddd3da 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UITabGroup.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UITabGroup.java @@ -1,25 +1,15 @@ package com.fr.design.gui.ibutton; -import javax.swing.*; -import javax.swing.border.Border; -import java.awt.*; +import javax.swing.Icon; +import java.util.Arrays; +/** + * 多行的Tab按钮组，默认为2行 + */ public class UITabGroup extends UIButtonGroup { - private boolean isOneLineTab = false; - private boolean isDrawLine = true; - private static final int BUTTON_NUMBER = 5; - private static final int SEVEN_NUMBER = 7; - private static final int ORIGINAL_WIDTH = 10; - private static final int GAP = 11; - /** - * 标签页改变 - * - * @param index 序号 - */ - public void tabChanged(int index) { - return; - } + private static final int DEFAULT_ROW_COUNT = 2; + private static final int ROW_MAX_LIMIT = 4; public UITabGroup(Icon[] iconArray) { super(iconArray, new Integer[iconArray.length]); @@ -32,39 +22,29 @@ public class UITabGroup extends UIButtonGroup { } @Override - protected LayoutManager getGridLayout(int number) { - if (number < BUTTON_NUMBER || isOneLineTab) { - return super.getGridLayout(number); - } else if (number == BUTTON_NUMBER || number == SEVEN_NUMBER) { - return new FiveButtonLayout(2); - } else { - return new GridLayout(2, 3, 1, 1); - } - } - - public void setOneLineTab(boolean isOneLineTab) { - this.isOneLineTab = isOneLineTab; + public void setSelectedIndex(int newSelectedIndex, boolean fireChanged) { + super.setSelectedIndex(newSelectedIndex, false); + tabChanged(newSelectedIndex); } - protected boolean isDrawLine() { - return isDrawLine; - } + public void tabChanged(int index) { - public void setDrawLine(boolean isDrawLine) { - this.isDrawLine = isDrawLine; } @Override - protected Border getGroupBorder() { - if (!isDrawLine) { - return BorderFactory.createEmptyBorder(0, 0, 0, 0); + protected int[] getCols() { + int buttons = totalButtonSize; + if (buttons < ROW_MAX_LIMIT) { + return new int[]{buttons}; } - return BorderFactory.createEmptyBorder(1, GAP, 1, GAP); + int[] cols = new int[DEFAULT_ROW_COUNT]; + if (buttons % DEFAULT_ROW_COUNT == 0) { + Arrays.fill(cols, buttons / DEFAULT_ROW_COUNT); + } else { + Arrays.fill(cols, buttons / DEFAULT_ROW_COUNT + 1); + cols[cols.length - 1] = buttons % cols[0]; + } + return cols; } - @Override - public void setSelectedIndex(int newSelectedIndex, boolean fireChanged) { - super.setSelectedIndex(newSelectedIndex, false); - tabChanged(newSelectedIndex); - } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java index 18764e9119..7d63ce319c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java @@ -1,5 +1,15 @@ package com.fr.design.gui.ibutton; +import com.fr.design.constants.UIConstants; +import com.fr.design.event.GlobalNameListener; +import com.fr.design.event.GlobalNameObserver; +import com.fr.stable.StringUtils; + +import javax.swing.AbstractAction; +import javax.swing.Icon; +import javax.swing.SwingUtilities; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Shape; @@ -9,14 +19,6 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.geom.RoundRectangle2D; -import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import com.fr.design.constants.UIConstants; -import com.fr.design.event.GlobalNameListener; -import com.fr.design.event.GlobalNameObserver; -import com.fr.stable.StringUtils; /** * SelectedAble button label @@ -26,6 +28,7 @@ import com.fr.stable.StringUtils; */ public class UIToggleButton extends UIButton implements GlobalNameObserver{ + private static final String UI_CLASS_ID = "ToggleButtonUI"; private static final int ICON_COUNT = 2; private boolean isSelected; private boolean isEventBannded = false; @@ -50,6 +53,11 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{ addMouseListener(getMouseListener()); } + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + /** * 需要反白的按钮接口(组合按钮情况-UIButtonGroup) * support icons[normalIcon, selectedIcon] @@ -125,22 +133,22 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{ } @Override - protected void initListener(){ - if(shouldResponseChangeListener()){ - this.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - if (uiObserverListener == null) { - return; - } + protected void initListener(){ + if(shouldResponseChangeListener()){ + this.addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + if (uiObserverListener == null) { + return; + } if(globalNameListener!=null && shouldResponseNameListener()){ globalNameListener.setGlobalName(toggleButtonName); } - uiObserverListener.doChange(); - } - }); - } - } + uiObserverListener.doChange(); + } + }); + } + } public void setSelected(boolean isSelected, boolean fireChanged) { if (this.isSelected != isSelected) { @@ -243,7 +251,7 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{ */ @Override public void registerNameListener(GlobalNameListener listener) { - globalNameListener = listener; + globalNameListener = listener; } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java b/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java index 8162c7ba86..4bf97803c1 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java @@ -1,13 +1,11 @@ package com.fr.design.gui.icheckbox; -import com.fr.design.constants.UIConstants; +import com.fine.theme.icon.LazyIcon; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.core.UITextComponent; -import com.fr.design.utils.gui.GUIPaintUtils; -import com.fr.stable.Constants; import sun.swing.SwingUtilities2; import javax.swing.AbstractButton; @@ -38,32 +36,27 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser public UICheckBox(String string) { super(string); - setUI(new UICheckBoxUI()); initListener(); } public UICheckBox() { super(); - setUI(new UICheckBoxUI()); initListener(); } public UICheckBox(String locText, boolean b) { super(locText, b); - setUI(new UICheckBoxUI()); initListener(); } public UICheckBox(String locText, boolean b, boolean markMnemonic) { super(locText, b); - setUI(new UICheckBoxUI()); initListener(); this.markMnemonic = markMnemonic; } public UICheckBox(String text, Icon icon) { super(text, icon); - setUI(new UICheckBoxUI()); initListener(); } @@ -144,7 +137,7 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser * * @return UICheckBoxUI */ - public UICheckBoxUI getUICheckBoxUI(){ + public UICheckBoxUI getUICheckBoxUI() { return new UICheckBoxUI(); } @@ -176,28 +169,15 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser b.getVerticalTextPosition(), b.getHorizontalTextPosition(), viewRect, iconRect, textRect, b.getIconTextGap()); - // fill background - if (c.isOpaque()) { - g.setColor(b.getBackground()); - g.fillRect(0, 0, size.width, size.height); - } - Graphics2D g2d = (Graphics2D) g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); if (model.isSelected()) { - GUIPaintUtils.fillPaint(g2d, iconRect.x, iconRect.y, iconRect.width, iconRect.height, false, Constants.NULL, - model.isEnabled() ? UIConstants.CHECKBOX_HOVER_SELECTED : UIConstants.DISABLED_ICON_COLOR, 0); - } else if (model.isRollover() && !model.isSelected()) { - g.setColor(UIConstants.CHECKBOX_HOVER_SELECTED); - g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC); + new LazyIcon("checkbox_checked").paintIcon(c, g, iconRect.x, iconRect.y); + } else if (model.isRollover()) { + new LazyIcon("checkbox_hovered").paintIcon(c, g, iconRect.x, iconRect.y); } else { - g.setColor(UIConstants.LINE_COLOR); - g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC); + new LazyIcon("checkbox_unchecked").paintIcon(c, g, iconRect.x, iconRect.y); } - - if (model.isSelected()) { - UIConstants.YES_ICON.paintIcon(c, g, iconRect.x + 2, iconRect.y + 2); - } g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); // Draw the Text diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java index 9f9a3f13c0..2ace77e344 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java @@ -1,5 +1,6 @@ package com.fr.design.gui.icombobox; +import com.fine.theme.utils.FineUIScale; import com.fr.base.ChartColorMatching; import com.fr.base.ChartPreStyleConfig; import com.fr.base.theme.TemplateTheme; @@ -232,7 +233,7 @@ public class ColorSchemeComboBox extends UIComboBox { @Override public Dimension getPreferredSize() { Dimension preferredSize = super.getPreferredSize(); - preferredSize.setSize(super.getPreferredSize().getWidth(), HEIGHT); + preferredSize.setSize(super.getPreferredSize().getWidth(), FineUIScale.scale(HEIGHT)); return preferredSize; } @@ -251,7 +252,7 @@ public class ColorSchemeComboBox extends UIComboBox { } else { FontMetrics fontMetrics = comp.getFontMetrics(comp.getFont()); //宽度是5倍的高加上4倍的留白 - double width = (HEIGHT - 2 * Y) * MAX_COUNT + BLANK * (MAX_COUNT - 1); + double width = FineUIScale.scale((float) ((HEIGHT - 2 * Y) * MAX_COUNT + BLANK * (MAX_COUNT - 1))); String fill = BLANK_SPACE; //图形和文字之间留的宽度大于3倍的X while (fontMetrics.stringWidth(fill) < width + 3 * X) { @@ -284,7 +285,7 @@ public class ColorSchemeComboBox extends UIComboBox { double width = height * MAX_COUNT + BLANK * (MAX_COUNT - 1); LinearGradientPaint linearGradientPaint = new LinearGradientPaint((float) X, (float) Y, (float) (X + width), (float) Y, new float[]{0f, 1f}, colors.toArray(new Color[colors.size()])); g2d.setPaint(linearGradientPaint); - Rectangle2D rec = new Rectangle2D.Double(X, Y, width, height); + Rectangle2D rec = new Rectangle2D.Double(FineUIScale.scale((float) X), FineUIScale.scale((float) Y), FineUIScale.scale((float) width), FineUIScale.scale((float) height)); g2d.fill(rec); } @@ -295,7 +296,7 @@ public class ColorSchemeComboBox extends UIComboBox { double width = ((height + BLANK) * MAX_COUNT - size) / size; for (int i = 0; i < size; i++) { g2d.setPaint(colors.get(i)); - Rectangle2D rec = new Rectangle2D.Double(X + (width + BLANK) * i, Y, width, height); + Rectangle2D rec = new Rectangle2D.Double(FineUIScale.scale((float) (X + (width + BLANK) * i)), FineUIScale.scale((float) Y), FineUIScale.scale((float) width), FineUIScale.scale((float) height)); g2d.fill(rec); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryComboBox.java index 10b1817e59..5fcc60e99c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryComboBox.java @@ -27,7 +27,6 @@ public class DictionaryComboBox extends UIComboBox { } private void initComboBox(Object[] keys, String[] displays, boolean editable){ - this.setPreferredSize(new Dimension(60, 20)); this.keys = keys; this.values = displays; this.setModel(new DefaultComboBoxModel(keys)); diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/ExtendedComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/ExtendedComboBox.java index 70fa9dccdf..d931538a19 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/ExtendedComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/ExtendedComboBox.java @@ -3,21 +3,16 @@ package com.fr.design.gui.icombobox; import com.fr.common.inputevent.InputEventBaseOnOS; import java.awt.Component; -import java.awt.Dimension; import java.awt.Point; import java.awt.Rectangle; -import java.awt.event.InputEvent; import java.awt.event.MouseEvent; import java.util.Vector; import javax.swing.ComboBoxModel; import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JList; import javax.swing.ListCellRenderer; -import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicComboPopup; -import javax.swing.plaf.basic.ComboPopup; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -40,36 +35,6 @@ public class ExtendedComboBox extends UIComboBox { super(items); } - /** - * 更新UI - */ - public void updateUI() { - setUI(new ExtendedComboBoxUI()); - } - - @Override - public Dimension getPreferredSize() { - Dimension dim = super.getPreferredSize(); - dim.width = VALUE120; - return dim; - } - - static class ExtendedComboBoxUI extends UIBasicComboBoxUI { - public static ComponentUI createUI(JComponent c) { - return new ExtendedComboBoxUI(); - } - - protected ComboPopup createPopup() { - ExtendedComboPopup popup = new ExtendedComboPopup(comboBox); - popup.getAccessibleContext().setAccessibleParent(comboBox); - return popup; - } - - public ComboPopup getPopup() { - return popup; - } - } - static class ExtendedComboPopup extends BasicComboPopup { public ExtendedComboPopup(JComboBox combo) { diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java index c122394476..6f8589a104 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java @@ -1,5 +1,6 @@ package com.fr.design.gui.icombobox; +import com.fine.theme.light.ui.FineComboBoxUI; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; @@ -20,6 +21,7 @@ import javax.swing.JScrollPane; import javax.swing.JTree; import javax.swing.MenuSelectionManager; import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.PopupMenuListener; @@ -248,8 +250,7 @@ public class FRTreeComboBox extends UIComboBox { private static TreePopup treePopup; - protected static class FRTreeComboBoxUI extends BasicComboBoxUI implements MouseListener{ - private boolean isRollover = false; + protected static class FRTreeComboBoxUI extends FineComboBoxUI { public FRTreeComboBoxUI() { super(); @@ -258,81 +259,7 @@ public class FRTreeComboBox extends UIComboBox { treePopup = new TreePopup(comboBox); return treePopup; } - @Override - protected UIButton createArrowButton() { - arrowButton = new UIButton(UIConstants.ARROW_DOWN_ICON){ - /** - * 组件是否需要响应添加的观察者事件 - * - * @return 如果需要响应观察者事件则返回true，否则返回false - */ - @Override - public boolean shouldResponseChangeListener() { - return false; - } - }; - ((UIButton) arrowButton).setRoundBorder(true, Constants.LEFT); - arrowButton.addMouseListener(this); - comboBox.addMouseListener(this); - return (UIButton) arrowButton; - } - - public void paint(Graphics g, JComponent c) { - super.paint(g, c); - Graphics2D g2d = (Graphics2D)g; - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - Color linecolor = null; - if (comboBox.isPopupVisible()) { - linecolor = UIConstants.LINE_COLOR; - arrowButton.setSelected(true); - } else if (isRollover) { - linecolor = UIConstants.LIGHT_BLUE; - } else { - linecolor = UIConstants.LINE_COLOR; - arrowButton.setSelected(false); - } - g2d.setColor(linecolor); - if (!comboBox.isPopupVisible()) { - g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.LARGEARC, UIConstants.LARGEARC); - } else { - g2d.drawRoundRect(0, 0, c.getWidth() , c.getHeight() + 3, UIConstants.LARGEARC, UIConstants.LARGEARC ); - g2d.drawLine(0, c.getHeight()-1, c.getWidth(), c.getHeight()-1); - } - } - - - - private void setRollover(boolean isRollover) { - if (this.isRollover != isRollover) { - this.isRollover = isRollover; - comboBox.repaint(); - } - } - - @Override - public void mouseEntered(MouseEvent e) { - setRollover(true); - } - - @Override - public void mouseExited(MouseEvent e) { - setRollover(false); - } - - @Override - public void mouseClicked(MouseEvent e) { - // do nothing - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override - public void mouseReleased(MouseEvent e) { - - } } /** @@ -344,7 +271,9 @@ public class FRTreeComboBox extends UIComboBox { * */ public void addPopupMenuListener(PopupMenuListener l) { - treePopup.addPopupMenuListener(l); + if (treePopup != null) { + treePopup.addPopupMenuListener(l); + } } private class TreeComboBoxRenderer extends DefaultListCellRenderer { @@ -430,7 +359,9 @@ public class FRTreeComboBox extends UIComboBox { public TreePopup(JComboBox comboBox) { this.comboBox = (FRTreeComboBox) comboBox; - this.setBorder(BorderFactory.createLineBorder(Color.black)); + this.setBackground(UIManager.getColor("PopupMenu.background")); + + this.setBorder(UIManager.getBorder( "PopupMenu.border" )); this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLightWeightPopupEnabled(comboBox .isLightWeightPopupEnabled()); diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java index 65e24a7c3a..eef2c2c8b9 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java @@ -3,6 +3,7 @@ */ package com.fr.design.gui.icombobox; +import com.fine.theme.utils.FineUIScale; import com.fr.base.GraphHelper; import com.fr.stable.Constants; import com.fr.stable.StringUtils; @@ -17,6 +18,9 @@ import java.awt.geom.Point2D; * Combobox for selecting line styles. */ public class LineComboBox extends UIComboBox { + + private static final int LINE_HEIGHT = 16; + /** * Constructor. * @@ -48,7 +52,7 @@ public class LineComboBox extends UIComboBox { * Set the selected line style. */ public void setSelectedLineStyle(int style) { - this.setSelectedItem(new Integer(style)); + this.setSelectedItem(new Integer(style)); } protected String toStringFromStyle(int style) { @@ -64,7 +68,7 @@ public class LineComboBox extends UIComboBox { class LineCellRenderer extends UIComboBoxRenderer { public Component getListCellRendererComponent( JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - JLabel comp= (JLabel)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + JLabel comp = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); this.style = ((Integer) value).intValue(); String displayString = toStringFromStyle(style); if (StringUtils.isNotEmpty(displayString)) { @@ -76,56 +80,56 @@ public class LineComboBox extends UIComboBox { } public void paint(Graphics g) { - super.paint(g); - if (StringUtils.isEmpty(toStringFromStyle(style))) { + super.paint(g); + if (StringUtils.isEmpty(toStringFromStyle(style))) { Graphics2D g2d = (Graphics2D) g; Dimension d = getSize(); g2d.setColor(getForeground()); GraphHelper.drawLine(g2d, 4, d.height / 2D, d.width - 8D, d.height / 2D, style); - if(isShowAxisWithLineStyle()) { // 带有坐标轴箭头的样式. + if (isShowAxisWithLineStyle()) { // 带有坐标轴箭头的样式. drawArrow(g2d, new Point2D.Double(4, d.height / 2D), new Point2D.Double(d.width - 8D, d.height / 2D)); } } } - + private void drawArrow(Graphics2D g2d, Point2D p0, Point2D p1) { - Point2D s = new Point2D.Double(p1.getX() - p0.getX(), p1.getY() - p0.getY()); - Point2D t = new Point2D.Double(); - double d1 = p0.distance(p1); - //d2-d5设定箭头的大小,p1-p2为坐标轴的延长线,p2-p5-p3-p6为箭头4个点的具体位置 - double d2 = 9; - double d3 = 15; - double d4 = 7; - double d5 = 3; - t.setLocation(d2 * s.getX() / d1, d2 * s.getY() / d1); - Point2D p2 = new Point2D.Double(p1.getX() + t.getX(), p1.getY() + t.getY()); - t.setLocation(d3 * s.getX() / d1, d3 * s.getY() / d1); - Point2D p3 = new Point2D.Double(p1.getX() + t.getX(), p1.getY() + t.getY()); - t.setLocation(d4 * s.getX() / d1, d4 * s.getY() / d1); - Point2D p4 = new Point2D.Double(p1.getX() + t.getX(), p1.getY() + t.getY()); - Point2D p5 = new Point2D.Double(p4.getX() + s.getY() / d1 * d5, p4.getY() - s.getX() / d1 * d5); - Point2D p6 = new Point2D.Double(p4.getX() - s.getY() / d1 * d5, p4.getY() + s.getX() / d1 * d5); - - GeneralPath arrow = new GeneralPath(); - arrow.moveTo((float) p2.getX() - 10, (float) p2.getY()); - arrow.lineTo((float) p5.getX() - 10, (float) p5.getY()); - arrow.lineTo((float) p3.getX() - 10, (float) p3.getY()); - arrow.lineTo((float) p6.getX() - 10, (float) p6.getY()); - arrow.closePath(); - - g2d.draw(arrow); - g2d.fill(arrow); + Point2D s = new Point2D.Double(p1.getX() - p0.getX(), p1.getY() - p0.getY()); + Point2D t = new Point2D.Double(); + double d1 = p0.distance(p1); + //d2-d5设定箭头的大小,p1-p2为坐标轴的延长线,p2-p5-p3-p6为箭头4个点的具体位置 + double d2 = 9; + double d3 = 15; + double d4 = 7; + double d5 = 3; + t.setLocation(d2 * s.getX() / d1, d2 * s.getY() / d1); + Point2D p2 = new Point2D.Double(p1.getX() + t.getX(), p1.getY() + t.getY()); + t.setLocation(d3 * s.getX() / d1, d3 * s.getY() / d1); + Point2D p3 = new Point2D.Double(p1.getX() + t.getX(), p1.getY() + t.getY()); + t.setLocation(d4 * s.getX() / d1, d4 * s.getY() / d1); + Point2D p4 = new Point2D.Double(p1.getX() + t.getX(), p1.getY() + t.getY()); + Point2D p5 = new Point2D.Double(p4.getX() + s.getY() / d1 * d5, p4.getY() - s.getX() / d1 * d5); + Point2D p6 = new Point2D.Double(p4.getX() - s.getY() / d1 * d5, p4.getY() + s.getX() / d1 * d5); + + GeneralPath arrow = new GeneralPath(); + arrow.moveTo((float) p2.getX() - 10, (float) p2.getY()); + arrow.lineTo((float) p5.getX() - 10, (float) p5.getY()); + arrow.lineTo((float) p3.getX() - 10, (float) p3.getY()); + arrow.lineTo((float) p6.getX() - 10, (float) p6.getY()); + arrow.closePath(); + + g2d.draw(arrow); + g2d.fill(arrow); } - + private boolean isShowAxisWithLineStyle() { - return style == Constants.LINE_CHART_MED_ARROW - || style == Constants.LINE_CHART_THICK_ARROW || style == Constants.LINE_CHART_THIN_ARROW; + return style == Constants.LINE_CHART_MED_ARROW + || style == Constants.LINE_CHART_THICK_ARROW || style == Constants.LINE_CHART_THIN_ARROW; } public Dimension getPreferredSize() { - return new Dimension(60, 16); + return new Dimension(getWidth(), FineUIScale.scale(LINE_HEIGHT)); } public Dimension getMinimumSize() { diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java index e6130ca3da..27dea24e21 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java @@ -1,13 +1,19 @@ package com.fr.design.gui.icombobox; +import com.fine.theme.light.ui.FineComboBoxUI; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; +import com.fr.design.event.HoverAware; import javax.swing.ComboBoxModel; import javax.swing.JComboBox; import javax.swing.ListCellRenderer; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; import javax.swing.plaf.ComboBoxUI; import javax.swing.plaf.basic.ComboPopup; import java.awt.Dimension; @@ -15,6 +21,8 @@ import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.List; import java.util.Vector; @@ -28,23 +36,18 @@ import java.util.Vector; * @author zhou * @since 2012-5-9下午3:18:58 */ -public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObserver { +public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObserver, HoverAware { - /** - * - */ private static final long serialVersionUID = 1L; - private static final int SIZE = 20; - - private static final int SIZE5 = 5; - protected UIObserverListener uiObserverListener; private String comboBoxName = ""; private GlobalNameListener globalNameListener = null; + private boolean hovered; + public UIComboBox() { super(); init(); @@ -67,7 +70,6 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser private void init() { setOpaque(false); - setUI(getUIComboBoxUI()); setRenderer(new UIComboBoxRenderer()); setEditor(new UIComboBoxEditor()); initListener(); @@ -93,6 +95,35 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser } } }); + this.addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent e) { + hovered = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + hovered = false; + repaint(); + } + }); + this.addPopupMenuListener(new PopupMenuListener() { + @Override + public void popupMenuWillBecomeVisible(PopupMenuEvent e) { + + } + + @Override + public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { + repaint(); + } + + @Override + public void popupMenuCanceled(PopupMenuEvent e) { + + } + }); } } @@ -104,7 +135,7 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser protected ComboBoxUI getUIComboBoxUI() { - return new UIComboBoxUI(); + return new FineComboBoxUI(); } /** @@ -128,8 +159,10 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser @Override public Dimension getPreferredSize() { - //加5的原因在于：render里，每一个项前面了空了一格，要多几像素 - return new Dimension(super.getPreferredSize().width + SIZE5, SIZE); + int renderFix = FineUIScale.scale(5); + int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24); + //renderFix的原因在于：render里，每一个项前面了空了一格，要多几像素 + return new Dimension(FineUIScale.scale(super.getPreferredSize().width) + renderFix, comboHeight); } public void refreshBoxItems(List list) { @@ -161,15 +194,6 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser } - /** - * - */ - @Override - public void updateUI() { - setUI(getUIComboBoxUI()); - } - - /** * @param listener 观察者监听事件 */ @@ -210,5 +234,8 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser return true; } - + @Override + public boolean isHovered() { + return hovered; + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxRenderer.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxRenderer.java index 0903070dc0..f0bf7b1a4e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxRenderer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxRenderer.java @@ -1,14 +1,10 @@ package com.fr.design.gui.icombobox; -import java.awt.Color; -import java.awt.Component; +import java.awt.Dimension; import javax.swing.DefaultListCellRenderer; -import com.fr.design.constants.UIConstants; - -import javax.swing.JList; -import javax.swing.JLabel; +import com.fine.theme.utils.FineUIScale; /** * @@ -23,20 +19,8 @@ public class UIComboBoxRenderer extends DefaultListCellRenderer { super(); } - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - cellHasFocus = cellHasFocus && !this.isEnabled(); - JLabel renderer =(JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - renderer.setOpaque(true); - list.setSelectionBackground(UIConstants.NORMAL_BLUE); - list.setSelectionForeground(Color.WHITE); - if (isSelected) { - renderer.setForeground(list.getSelectionForeground()); - renderer.setBackground(list.getSelectionBackground()); - } else { - renderer.setForeground(list.getForeground()); - renderer.setBackground(list.getBackground()); - } - renderer.setText(" " + renderer.getText()); - return renderer; + @Override + public Dimension getPreferredSize() { + return new Dimension(super.getPreferredSize().width, FineUIScale.scale(24)); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java b/designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java index 80e7e88bbf..7bc5dac7e7 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java @@ -1,5 +1,8 @@ package com.fr.design.gui.icombocheckbox; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseUtils; import com.fr.design.constants.UIConstants; import com.fr.design.gui.icontainer.UIScrollPane; @@ -11,6 +14,7 @@ import com.fr.general.IOUtils; import javax.swing.JCheckBox; import javax.swing.JPanel; +import javax.swing.UIManager; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -34,7 +38,7 @@ public class UICheckListPopup extends UIPopupMenu { private Object[] values; private JPanel checkboxPane; private UIScrollPane jScrollPane; - private Color mouseEnteredColor = UIConstants.CHECKBOX_HOVER_SELECTED; + private Color mouseEnteredColor = UIManager.getColor("List.selectionBackground"); private int maxDisplayNumber = 8; private boolean supportSelectAll = true; /** @@ -81,7 +85,7 @@ public class UICheckListPopup extends UIPopupMenu { checkboxPane.setLayout(new GridLayout(checkBoxList.size(), 1, 0, 0)); checkboxPane.setBackground(Color.WHITE); jScrollPane = new UIScrollPane(checkboxPane); - + jScrollPane.setBorder(new FineRoundBorder()); this.setLayout(new BorderLayout()); this.add(jScrollPane, BorderLayout.CENTER); @@ -106,10 +110,10 @@ public class UICheckListPopup extends UIPopupMenu { } addSelectListener(); - jScrollPane.setPreferredSize(new Dimension(130, checkBoxList.size() * CHECKBOX_HEIGHT + 10)); + jScrollPane.setPreferredSize(FineUIScale.scale(new Dimension(144, checkBoxList.size() * CHECKBOX_HEIGHT + 10))); //超过1页的数量时显示滚动条 if (checkBoxList.size() > maxDisplayNumber) { - jScrollPane.setPreferredSize(new Dimension(130, maxDisplayNumber * CHECKBOX_HEIGHT)); + jScrollPane.setPreferredSize(FineUIScale.scale(new Dimension(144, maxDisplayNumber * CHECKBOX_HEIGHT))); } checkboxPane.repaint(); jScrollPane.repaint(); @@ -117,11 +121,11 @@ public class UICheckListPopup extends UIPopupMenu { private void addOneCheckValue(Object checkValue) { JPanel checkPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - checkPane.setPreferredSize(new Dimension(120, CHECKBOX_HEIGHT)); + checkPane.setPreferredSize(FineUIScale.scale(new Dimension(144, CHECKBOX_HEIGHT))); final JCheckBox temp = createCheckbox(); final UILabel label = new UILabel(checkValue.toString()); label.setBackground(Color.WHITE); - label.setPreferredSize(new Dimension(80, 20)); + label.setPreferredSize(FineUIScale.scale(new Dimension(100, 20))); checkPane.setBackground(Color.WHITE); checkPane.add(temp); checkPane.add(label); @@ -137,10 +141,10 @@ public class UICheckListPopup extends UIPopupMenu { private JCheckBox createCheckbox() { JCheckBox checkBox = new JCheckBox(); - checkBox.setPreferredSize(new Dimension(20, 20)); + checkBox.setPreferredSize(FineUIScale.scale(new Dimension(20, 20))); checkBox.setBackground(Color.WHITE); - checkBox.setIcon(IOUtils.readIcon(IconPathConstants.CHECKBOX_NORMAL)); - checkBox.setSelectedIcon(IOUtils.readIcon(IconPathConstants.CHECKBOX_SELECTED)); + checkBox.setIcon(new LazyIcon("checkbox_unchecked")); + checkBox.setSelectedIcon(new LazyIcon("checkbox_checked")); return checkBox; } @@ -162,6 +166,7 @@ public class UICheckListPopup extends UIPopupMenu { public void mouseEntered(MouseEvent e) { label.setOpaque(true); label.setBackground(mouseEnteredColor); + repaint(); } @Override @@ -252,17 +257,17 @@ public class UICheckListPopup extends UIPopupMenu { private void switchSelectIcon(int selectCount) { JCheckBox checkBox = checkBoxList.get(0); if (selectCount == 0) { - checkBox.setIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_NORMAL)); + checkBox.setIcon(new LazyIcon("checkbox_unchecked")); } else if (selectCount < checkBoxList.size() - 1) { //虽然有选中，但是要判断此时全选状态去换图标 if (checkBoxList.get(0).isSelected()) { - checkBox.setSelectedIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_HATFSELECT)); + checkBox.setSelectedIcon(new LazyIcon("checkbox_checked")); } else { - checkBox.setIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_HATFSELECT)); + checkBox.setIcon(new LazyIcon("checkbox_part_checked")); } } else { //全选了，图标要换回来 - checkBox.setSelectedIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_SELECTED)); + checkBox.setIcon(new LazyIcon("checkbox_checked")); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java b/designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java index ce0a9f869e..d5f573f773 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java @@ -1,13 +1,16 @@ package com.fr.design.gui.icombocheckbox; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; +import com.fr.design.event.HoverAware; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.icon.IconPathConstants; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.stable.StringUtils; @@ -38,8 +41,12 @@ import java.util.Map; * 支持全选、半选 * 可以设置悬停颜色、一页最多显示单选框个数 * 可以省略显示 + * + * @author + * @since + * Created on */ -public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNameObserver { +public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNameObserver, HoverAware { //下拉框的值 private Object[] values; //已经选中的值 @@ -49,6 +56,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam private UICheckListPopup popup; private UITextField editor; private UIButton arrowButton; + private UILabel label; //选中的值之间显示的分隔符 private String valueSperator; private static final String DEFAULT_VALUE_SPERATOR = ","; @@ -62,6 +70,8 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam private boolean supportSelectAll = true; private String placeHolder = StringUtils.EMPTY; + private boolean rollOver; + public UIComboCheckBox(Object[] value) { this(value, DEFAULT_VALUE_SPERATOR, true); } @@ -117,8 +127,15 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam this.popup.addActionListener(new PopupAction()); this.editor = createEditor(); this.arrowButton = createArrowButton(); + this.label = new UILabel(getIcon()); + label.setPreferredSize(FineUIScale.scale(new Dimension(24, 24))); + setLayoutAndAddComponents(); setText(); + + addPopupListener(this); + setBackground(Color.WHITE); + setOpaque(true); } /** @@ -151,69 +168,24 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam return arrowButton; } + public UILabel getLabel() { + return label; + } + private UIButton createArrowButton() { final UIButton arrowBtn = new UIButton(); arrowBtn.setNormalPainted(false); - arrowBtn.setPreferredSize(new Dimension(20, 5)); - arrowBtn.setBackground(new Color(218, 218, 218)); - arrowBtn.setOpaque(true); + arrowBtn.setPreferredSize(FineUIScale.scale(new Dimension(20, 5))); arrowBtn.setIcon(getIcon()); arrowBtn.setExtraPainted(false); addPopupListener(arrowBtn); - arrowBtn.addMouseListener(new MouseAdapter() { - @Override - public void mouseEntered(MouseEvent e) { - arrowBtn.setBackground(new Color(200, 200, 200)); - } - - @Override - public void mouseExited(MouseEvent e) { - arrowBtn.setBackground(new Color(218, 218, 218)); - } - }); return arrowBtn; } private UITextField createEditor() { - UITextField editor = new UITextField() { - @Override - protected void initListener() { - this.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - attributeChange(); - } - }); - this.addFocusListener(new FocusAdapter() { - @Override - public void focusLost(FocusEvent e) { - attributeChange(); - } - }); - UIComboCheckBox.this.popup.addPopupMenuListener(new PopupMenuListener() { - @Override - public void popupMenuWillBecomeVisible(PopupMenuEvent e) { - // do nothing - } - - @Override - public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { - attributeChange(); - if (uiObserverListener != null) { - uiObserverListener.doChange(); - } - } - - @Override - public void popupMenuCanceled(PopupMenuEvent e) { - // do nothing - } - }); - } - }; + UITextField editor = new TextField(); editor.setEditable(false); - editor.setPreferredSize(new Dimension(110, 20)); addPopupListener(editor); return editor; @@ -230,6 +202,18 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam public void mouseClicked(MouseEvent e) { togglePopup(); } + + @Override + public void mouseEntered(MouseEvent e) { + rollOver = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + rollOver = false; + repaint(); + } }); } @@ -254,6 +238,11 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam return popup.getSelectedValues(); } + @Override + public boolean isHovered() { + return rollOver || this.popup.isShowing(); + } + private class PopupAction implements ActionListener { @Override @@ -269,6 +258,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam private void togglePopup() { if (this.arrowButton.isEnabled()) { + popup.setBorder(new FineRoundBorder()); popup.show(this, 0, getHeight()); } } @@ -391,7 +381,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam } private Icon getIcon() { - return BaseUtils.readIcon(IconPathConstants.ARROW_ICON_PATH); + return new LazyIcon("down_arrow"); } /** @@ -434,6 +424,47 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam this.arrowButton.setEnabled(enabled); } + private class TextField extends UITextField { + @Override + protected void initListener() { + this.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + attributeChange(); + } + }); + this.addFocusListener(new FocusAdapter() { + @Override + public void focusLost(FocusEvent e) { + attributeChange(); + } + }); + addPopupMenuListener(); + } + + private void addPopupMenuListener() { + UIComboCheckBox.this.popup.addPopupMenuListener(new PopupMenuListener() { + @Override + public void popupMenuWillBecomeVisible(PopupMenuEvent e) { + // do nothing + } + + @Override + public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { + attributeChange(); + if (uiObserverListener != null) { + uiObserverListener.doChange(); + } + } + + @Override + public void popupMenuCanceled(PopupMenuEvent e) { + // do nothing + } + }); + } + } + /** * 简单的测试demo * @param args diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java index cec4b840a7..d85793d5c4 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java @@ -1,24 +1,28 @@ package com.fr.design.gui.icontainer; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.layout.VerticalFlowLayout; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.utils.SvgDrawUtils; import com.fr.design.utils.gui.GUICoreUtils; +import javax.swing.BorderFactory; +import javax.swing.UIManager; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPanel; +import javax.swing.Icon; +import javax.swing.border.Border; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.awt.Cursor; import java.awt.Dimension; import java.awt.Graphics; -import java.awt.Image; import java.awt.LayoutManager; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -30,25 +34,23 @@ import java.awt.event.MouseMotionListener; public class UIEastResizableContainer extends JPanel { private static final long serialVersionUID = 1854340560790476907L; - public static final int MAX_CONTAINER_WIDTH = 340; - public static final int MIN_CONTAINER_WIDTH = 286; + public static final int MAX_CONTAINER_WIDTH = FineUIScale.scale(340); + public static final int MIN_CONTAINER_WIDTH = FineUIScale.scale(286); - private int containerWidth = 240; - private int preferredWidth = 240; - private int topToolPaneHeight = 25; - private int leftPaneWidth = 40; + private int containerWidth = FineUIScale.scale(240); + private int preferredWidth = FineUIScale.scale(240); + private int topToolPaneHeight = FineUIScale.scale(40); + private int leftPaneWidth = FineUIScale.scale(42); private JComponent leftPane; private JComponent rightPane; - // private HorizotalToolPane horizontToolPane; private TopToolPane topToolPane; - private static final int ARROW_MARGIN = 15; - private static final int ARROW_RANGE = 35; + private static final int ARROW_MARGIN = FineUIScale.scale(15); + private static final int ARROW_RANGE = FineUIScale.scale(35); -// private boolean isRightPaneVisible = true; public UIEastResizableContainer() { this(new JPanel(), new JPanel()); @@ -69,21 +71,17 @@ public class UIEastResizableContainer extends JPanel { } -// public void setRightPaneVisible(boolean isVisible){ -// this.isRightPaneVisible = isVisible; -// } private void setPreferredWidth(int width) { this.preferredWidth = width; } public UIEastResizableContainer(JComponent leftPane, JComponent rightPane) { - setBackground(UIConstants.PROPERTY_PANE_BACKGROUND); this.leftPane = leftPane; this.rightPane = rightPane; - this.topToolPane = new TopToolPane(); - topToolPane.setBackground(UIConstants.PROPERTY_PANE_BACKGROUND); + topToolPane.setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 1, 0)); + topToolPane.setBorder(BorderFactory.createMatteBorder(0 ,1, 0, 1, UIManager.getColor("East.border"))); setLayout(containerLayout); add(topToolPane); @@ -98,9 +96,9 @@ public class UIEastResizableContainer extends JPanel { content.setLayout(new BorderLayout()); JPanel leftPane = new JPanel(); - leftPane.setBackground(Color.yellow); +// leftPane.setBackground(Color.yellow); JPanel rightPane = new JPanel(); - rightPane.setBackground(Color.green); +// rightPane.setBackground(Color.green); UIButton b1, b2; b1 = new UIButton("b1"); @@ -114,7 +112,7 @@ public class UIEastResizableContainer extends JPanel { UIEastResizableContainer bb = new UIEastResizableContainer(leftPane, rightPane); JPanel cc = new JPanel(); - cc.setBackground(Color.WHITE); +// cc.setBackground(Color.WHITE); content.add(bb, BorderLayout.EAST); content.add(cc, BorderLayout.CENTER); @@ -177,12 +175,8 @@ public class UIEastResizableContainer extends JPanel { if (topToolPane == null || rightPane == null) { return; } - -// topToolPane.setBounds(0, 0, containerWidth, topToolPaneHeight);//0,0,10,462 topToolPane.setBounds(0, 0, leftPaneWidth, topToolPaneHeight);//0,0,10,462 leftPane.setBounds(0, topToolPaneHeight, leftPaneWidth, getHeight() - topToolPaneHeight); - -// parameterPane.setBounds(20, 0, 230, getParameterPaneHeight());//10,0,230,462 rightPane.setBounds(leftPaneWidth, 0, containerWidth - leftPaneWidth, getHeight());//20,0,230,0 } @@ -278,6 +272,8 @@ public class UIEastResizableContainer extends JPanel { private class TopToolPane extends JPanel { private int model = UIConstants.MODEL_NORMAL; + private int buttonSize = FineUIScale.scale(12); + public TopToolPane() { super(); @@ -323,21 +319,18 @@ public class UIEastResizableContainer extends JPanel { @Override public void paint(Graphics g) { - Image button; + // 绘制边框 + Border border = getBorder(); + if (border != null) { + border.paintBorder(this, g, 0, 0, getWidth(), getHeight()); + } + Icon button; if (containerWidth == leftPaneWidth) { - if (model == UIConstants.MODEL_NORMAL) { - button = UIConstants.DRAG_LEFT_NORMAL; - } else { - button = UIConstants.DRAG_LEFT_PRESS; - } + button = new LazyIcon("drag_left"); } else { - if (model == UIConstants.MODEL_NORMAL) { - button = UIConstants.DRAG_RIGHT_NORMAL; - } else { - button = UIConstants.DRAG_RIGHT_PRESS; - } + button = new LazyIcon("drag_right"); } - SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, 10, 7, null)); + button.paintIcon(this, g, buttonSize, buttonSize); } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java index 627baf6b92..9002faf8b6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java @@ -1,35 +1,45 @@ package com.fr.design.gui.icontainer; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.base.vcs.DesignerMode; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; +import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JLayeredPane; import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.plaf.basic.BasicButtonUI; import java.awt.AlphaComposite; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; -import java.awt.Composite; import java.awt.Container; import java.awt.Cursor; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.LayoutManager; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; +import static com.fine.theme.utils.FineClientProperties.PANEL_TYPE; +import static com.fine.theme.utils.FineClientProperties.ROUNDED_PANEL; +import static com.fine.theme.utils.FineUIScale.scale; + public class UIModeControlContainer extends JLayeredPane { - private static int DIM_HEIGHT = 30; + private static final int ICON_WIDTH = 18; + private static int DIM_HEIGHT = 36; private static final int NUM32 = 32; private static final int NUM5 = 5; private JComponent upPane; @@ -47,7 +57,9 @@ public class UIModeControlContainer extends JLayeredPane { private boolean isHideMode = false; private boolean isSheeetCovered = false; - private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f); + private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.2f); + private Color coverBackground = UIManager.getColor("North.coverPane.background"); + private int coverRadius = UIManager.getInt("North.coverPane.radius"); public UIModeControlContainer() { this(new JPanel(), new JPanel()); @@ -111,9 +123,8 @@ public class UIModeControlContainer extends JLayeredPane { horizontToolPane = new JPanel() { @Override public void paint(Graphics g) { - g.drawImage(UIConstants.DRAG_BAR, 0, 0, getWidth(), getHeight(), null); if (upEditMode) { - g.drawImage(UIConstants.DRAG_DOT, (getWidth() - toolPaneHeight) / 2, 3, toolPaneHeight, 5, null); + g.drawImage(UIConstants.DRAG_DOT, (getWidth() - toolPaneHeight) / 2, 3, toolPaneHeight, 8, null); } } }; @@ -279,15 +290,14 @@ public class UIModeControlContainer extends JLayeredPane { private class HidePane extends JPanel { public HidePane() { - setLayout(new FlowLayout(FlowLayout.CENTER, 10, -3)); - setBackground(UIConstants.NORMAL_BACKGROUND); - add(new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Panel") + "")); - UIButton viewButton = new UIButton(UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_NORMAL_ICON) { - @Override - public Dimension getPreferredSize() { - return new Dimension(32, 32); - } - }; + setLayout(new FlowLayout(FlowLayout.CENTER, 10, 0)); + setBackground(FlatUIUtils.getUIColor("North.hidePane.background", UIConstants.NORMAL_BACKGROUND)); + UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Parameter_Panel")); + FineUIUtils.setFontSize(label, 14); + add(label); + LazyIcon paramViewIcon = new LazyIcon("param_view", 24); + LazyIcon paramViewPressedIcon = new LazyIcon("param_view_pressed", 24); + UIButton viewButton = new LargeButton(paramViewIcon, paramViewPressedIcon, paramViewPressedIcon); viewButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { @@ -296,17 +306,17 @@ public class UIModeControlContainer extends JLayeredPane { } }); add(viewButton); + putClientProperty(PANEL_TYPE, ROUNDED_PANEL); } @Override public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); - dim.height = DIM_HEIGHT; + dim.height = scale(DIM_HEIGHT); return dim; } } - private class AuthoritySheetInvisibleCoverPane extends JPanel { public AuthoritySheetInvisibleCoverPane() { setLayout(invisibleCoverLayout); @@ -351,16 +361,10 @@ public class UIModeControlContainer extends JLayeredPane { @Override public void paint(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - Composite oldComposite = g2d.getComposite(); - g2d.setComposite(composite); - g2d.setColor(Color.BLACK); - g2d.fillRect(0, 0, getWidth(), getHeight()); - g2d.setComposite(oldComposite); + FineUIUtils.paintWithComposite(g, composite, coverBackground, getWidth(), getHeight(), coverRadius); super.paint(g); } - } private class CoverPane extends JPanel { @@ -379,18 +383,8 @@ public class UIModeControlContainer extends JLayeredPane { } }); - editButton = new UIButton(UIConstants.EDIT_NORMAL_ICON, UIConstants.EDIT_PRESSED_ICON, UIConstants.EDIT_PRESSED_ICON) { - @Override - public Dimension getPreferredSize() { - return new Dimension(40, 40); - } - }; - hideButton = new UIButton(UIConstants.HIDE_NORMAL_ICON, UIConstants.HIDE_PRESSED_ICON, UIConstants.HIDE_PRESSED_ICON) { - @Override - public Dimension getPreferredSize() { - return new Dimension(40, 40); - } - }; + editButton = new LargeButton(new LazyIcon("param_edit", 24), new LazyIcon("param_edit_pressed", 24), new LazyIcon("param_edit_pressed", 24)); + hideButton = new LargeButton(new LazyIcon("param_hide", 24), new LazyIcon("param_hide_pressed", 24), new LazyIcon("param_hide_pressed", 24)); editButton.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent e) { @@ -453,16 +447,23 @@ public class UIModeControlContainer extends JLayeredPane { @Override public void paint(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - Composite oldComposite = g2d.getComposite(); - g2d.setComposite(composite); - g2d.setColor(Color.BLACK); - g2d.fillRect(0, 0, getWidth(), getHeight()); - g2d.setComposite(oldComposite); + FineUIUtils.paintWithComposite(g, composite, coverBackground, getWidth(), getHeight(), coverRadius); super.paint(g); } } + static class LargeButton extends UIButton { + public LargeButton(Icon normal, Icon rollOver, Icon pressed) { + super(normal, rollOver, pressed); + setUI(new BasicButtonUI()); + } + + @Override + public Dimension getPreferredSize() { + return new Dimension(40, 40); + } + } + /** * @param args */ diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java index a7682107ec..6cd8e8df4f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java @@ -1,23 +1,23 @@ package com.fr.design.gui.icontainer; -import com.fr.base.vcs.DesignerMode; -import com.fr.design.constants.UIConstants; +import com.fine.theme.utils.FineUIScale; +import com.fr.design.base.mode.DesignModeContext; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.utils.SvgDrawUtils; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.Constants; +import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPanel; +import javax.swing.UIManager; +import javax.swing.border.Border; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Container; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Image; import java.awt.LayoutManager; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -25,31 +25,28 @@ import java.awt.event.MouseMotionListener; public class UIResizableContainer extends JPanel { private static final long serialVersionUID = 1854340560790476907L; - private static final int MAX_PARA_HEIGHT = 240; - private int containerWidth = 240; - private int preferredWidth = 240; - private int toolPaneY = 300; - private int toolPaneHeight = 10; - private int bottomHeight = 30; + private int maxParaHeight = FineUIScale.scale(240); + private int containerWidth = FineUIScale.scale(240); + private int preferredWidth = FineUIScale.scale(240); + private int toolPaneY = FineUIScale.scale(300); + private int toolPaneHeight = FineUIScale.scale(5); + private int bottomHeight = FineUIScale.scale(30); private JComponent upPane; private JComponent downPane; //放参数面板 private JComponent parameterPane = new JPanel(); - private HorizotalToolPane horizontToolPane; + private HorizontalToolPane horizontalToolPane; private VerticalToolPane verticalToolPane; private int direction; private boolean hasParameterPane; - private static final int MAX_WIDTH = 300; - private static final int MIN_WIDTH = 165; + private static final int MAX_WIDTH = FineUIScale.scale(300); - private static final int ARROW_MARGIN = 15; - private static final int ARROW_MARGIN_VERTICAL = 7; - private static final int ARROW_RANGE = 35; - private static final int ARROW_RANGE_VERTICAL = 25; + private static final int ARROW_RANGE = FineUIScale.scale(35); + private static final int ARROW_RANGE_VERTICAL = FineUIScale.scale(25); private boolean isLeftRightDragEnabled = true; private boolean isDownPaneVisible = true ; @@ -89,32 +86,30 @@ public class UIResizableContainer extends JPanel { } public UIResizableContainer(JComponent upPane, JComponent downPane, int direction) { - setBackground(UIConstants.NORMAL_BACKGROUND); this.upPane = upPane; this.direction = direction; this.downPane = downPane; - this.horizontToolPane = new HorizotalToolPane(); + this.horizontalToolPane = new HorizontalToolPane(); this.verticalToolPane = new VerticalToolPane(); setLayout(containerLayout); add(upPane); - add(horizontToolPane); + add(horizontalToolPane); add(downPane); add(verticalToolPane); } public UIResizableContainer(JComponent upPane, int direction) { - setBackground(UIConstants.NORMAL_BACKGROUND); this.upPane = upPane; this.direction = direction; - this.horizontToolPane = new HorizotalToolPane(); + this.horizontalToolPane = new HorizontalToolPane(); setLayout(containerLayout); add(upPane); - add(horizontToolPane); + add(horizontalToolPane); } @@ -153,7 +148,7 @@ public class UIResizableContainer extends JPanel { * @param height */ public void setParameterHeight(int height) { - paraHeight = hasParameterPane? Math.min(height, MAX_PARA_HEIGHT) : 0; + paraHeight = hasParameterPane? Math.min(height, maxParaHeight) : 0; refreshContainer(); } @@ -221,7 +216,7 @@ public class UIResizableContainer extends JPanel { if (direction == Constants.RIGHT) { if(isDownPaneVisible){ upPane.setBounds(0, 0, containerWidth - toolPaneHeight, toolPaneY); - horizontToolPane.setBounds(0, toolPaneY, containerWidth - toolPaneHeight, toolPaneHeight); + horizontalToolPane.setBounds(0, toolPaneY, containerWidth, toolPaneHeight); downPane.setBounds(0, toolPaneY + toolPaneHeight, containerWidth - toolPaneHeight, parent.getHeight() - toolPaneY - toolPaneHeight - bottomHeight); verticalToolPane.setBounds(containerWidth - toolPaneHeight, 0, toolPaneHeight, getHeight()); }else{ @@ -233,13 +228,13 @@ public class UIResizableContainer extends JPanel { if (toolPaneY > getHeight() - toolPaneHeight - getParameterPaneHeight()) { toolPaneY = getHeight() - toolPaneHeight - getParameterPaneHeight(); } - parameterPane.setBounds(20, 0, 230, getParameterPaneHeight()); + parameterPane.setBounds(FineUIScale.scale(20), 0, FineUIScale.scale(230), getParameterPaneHeight()); upPane.setBounds(toolPaneHeight, getParameterPaneHeight(), containerWidth - toolPaneHeight, toolPaneY); - horizontToolPane.setBounds(toolPaneHeight, toolPaneY + getParameterPaneHeight(), containerWidth - toolPaneHeight, toolPaneHeight); + horizontalToolPane.setBounds(toolPaneHeight, toolPaneY + getParameterPaneHeight(), containerWidth, toolPaneHeight); downPane.setBounds(toolPaneHeight, toolPaneY + toolPaneHeight + getParameterPaneHeight(), containerWidth - toolPaneHeight, parent.getHeight() - toolPaneY - toolPaneHeight - getParameterPaneHeight()); verticalToolPane.setBounds(0, 0, toolPaneHeight, getHeight()); } else { - parameterPane.setBounds(20, 0, 230, getParameterPaneHeight()); + parameterPane.setBounds(FineUIScale.scale(20), 0, FineUIScale.scale(230), getParameterPaneHeight()); upPane.setBounds(toolPaneHeight, getParameterPaneHeight(), containerWidth - toolPaneHeight, getHeight() - getParameterPaneHeight()); verticalToolPane.setBounds(0, 0, toolPaneHeight, getHeight()); } @@ -252,7 +247,7 @@ public class UIResizableContainer extends JPanel { parentHeight = parent.getHeight(); } if (parentHeight != parent.getHeight() && (parent.getHeight() - toolPaneHeight) >= 0) { - // 调整toolPaneY，保证至少水平的拖拽条horizontToolPane不丢失 + // 调整toolPaneY，保证至少水平的拖拽条horizontalToolPane不丢失 toolPaneY = Math.min(toolPaneY, parent.getHeight() - toolPaneHeight); parentHeight = parent.getHeight(); } @@ -268,7 +263,7 @@ public class UIResizableContainer extends JPanel { * 得到最佳大小 */ public Dimension getPreferredSize() { - return new Dimension(containerWidth, 400); + return new Dimension(containerWidth, FineUIScale.scale(400)); } /** @@ -351,24 +346,24 @@ public class UIResizableContainer extends JPanel { } - private class HorizotalToolPane extends JPanel { - private int upModel = UIConstants.MODEL_NORMAL; - private int downModel = UIConstants.MODEL_NORMAL; + private class HorizontalToolPane extends JPanel { - public HorizotalToolPane() { + private Border paneBorder = BorderFactory.createMatteBorder(1, 0, 0, 1, UIManager.getColor("East.border")); + private Border hideBorder = BorderFactory.createMatteBorder(0, 0, 0, 1, UIManager.getColor("East.border")); + private final JPanel toolPane = this; + + public HorizontalToolPane() { super(); + this.setBorder(paneBorder); addMouseMotionListener(new MouseMotionListener() { @Override public void mouseMoved(MouseEvent e) { if (e.getX() <= ARROW_RANGE) { setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - upModel = UIConstants.MODEL_PRESS; } else if (e.getX() >= getWidth() - ARROW_RANGE) { setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - downModel = UIConstants.MODEL_PRESS; } else { - resetModel(); setCursor(Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR)); } repaint(); @@ -377,8 +372,9 @@ public class UIResizableContainer extends JPanel { @Override public void mouseDragged(MouseEvent e) { toolPaneY = e.getYOnScreen() - UIResizableContainer.this.getLocationOnScreen().y; - toolPaneY = toolPaneY < 0 ? 0 : toolPaneY; + toolPaneY = Math.max(toolPaneY, 0); toolPaneY = toolPaneY > UIResizableContainer.this.getHeight() - toolPaneHeight ? UIResizableContainer.this.getHeight() - toolPaneHeight - getParameterPaneHeight() : toolPaneY - getParameterPaneHeight(); + toolPane.setBorder(toolPaneY == 0 ? hideBorder : paneBorder); refreshContainer(); } }); @@ -392,7 +388,6 @@ public class UIResizableContainer extends JPanel { @Override public void mouseExited(MouseEvent e) { setCursor(Cursor.getDefaultCursor()); - resetModel(); repaint(); } @@ -410,35 +405,20 @@ public class UIResizableContainer extends JPanel { }); } - private void resetModel() { - upModel = UIConstants.MODEL_NORMAL; - downModel = UIConstants.MODEL_NORMAL; - } - - @Override - public void paint(Graphics g) { - - Image upButton = (upModel == UIConstants.MODEL_NORMAL ? UIConstants.DRAG_UP_NORMAL : UIConstants.DRAG_UP_PRESS); - Image downButton = (downModel == UIConstants.MODEL_NORMAL ? UIConstants.DRAG_DOWN_NORMAL : UIConstants.DRAG_DOWN_PRESS); - g.drawImage(UIConstants.DRAG_BAR_LIGHT, 0, 0, getWidth(), getHeight(), null); - SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, UIConstants.DRAG_LINE, (getWidth() - toolPaneHeight) / 2, 3, null)); - SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, upButton, ARROW_MARGIN, 0, null)); - SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, downButton, (getWidth() - toolPaneHeight - ARROW_MARGIN), 0, null)); - } } private class VerticalToolPane extends JPanel { - private int model = UIConstants.MODEL_NORMAL; public VerticalToolPane() { super(); + this.setOpaque(false); + this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, UIManager.getColor("East.border"))); addMouseMotionListener(new MouseMotionListener() { @Override public void mouseMoved(MouseEvent e) { if (e.getY() <= ARROW_RANGE_VERTICAL) { setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - model = UIConstants.MODEL_PRESS; } else if (isLeftRightDragEnabled) { setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR)); } @@ -458,10 +438,10 @@ public class UIResizableContainer extends JPanel { containerWidth = UIResizableContainer.this.getWidth() + (UIResizableContainer.this.getLocationOnScreen().x - e.getXOnScreen()); } - containerWidth = containerWidth > MAX_WIDTH ? MAX_WIDTH : containerWidth; - containerWidth = containerWidth < MIN_WIDTH ? MIN_WIDTH : containerWidth; + containerWidth = Math.min(containerWidth, MAX_WIDTH); + containerWidth = Math.max(containerWidth, toolPaneHeight); refreshContainer(); - if (DesignerMode.isAuthorityEditing()) { + if (DesignModeContext.isAuthorityEditing()) { DesignerContext.getDesignerFrame().doResize(); } @@ -480,7 +460,6 @@ public class UIResizableContainer extends JPanel { @Override public void mouseExited(MouseEvent e) { setCursor(Cursor.getDefaultCursor()); - model = UIConstants.MODEL_NORMAL; repaint(); } @@ -494,7 +473,7 @@ public class UIResizableContainer extends JPanel { containerWidth = toolPaneHeight; } refreshContainer(); - if (DesignerMode.isAuthorityEditing()) { + if (DesignModeContext.isAuthorityEditing()) { DesignerContext.getDesignerFrame().doResize(); } } @@ -502,46 +481,6 @@ public class UIResizableContainer extends JPanel { }); } - @Override - public void paint(Graphics g) { - Image button; - if (direction == Constants.RIGHT) { - g.drawImage(UIConstants.DRAG_BAR_LIGHT, 0, 0, toolPaneHeight, getHeight(), null); - if (containerWidth == toolPaneHeight) { - if (model == UIConstants.MODEL_NORMAL) { - button = UIConstants.DRAG_RIGHT_NORMAL; - } else { - button = UIConstants.DRAG_RIGHT_PRESS; - } - } else { - if (model == UIConstants.MODEL_NORMAL) { - button = UIConstants.DRAG_LEFT_NORMAL; - } else { - button = UIConstants.DRAG_LEFT_PRESS; - } - } - SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, -6, ARROW_MARGIN_VERTICAL, VerticalToolPane.this)); - } else { - g.drawImage(UIConstants.DRAG_BAR_LIGHT, 0, 0, toolPaneHeight, getHeight(), null); - if (containerWidth == toolPaneHeight) { - if (model == UIConstants.MODEL_NORMAL) { - button = UIConstants.DRAG_LEFT_NORMAL; - } else { - button = UIConstants.DRAG_LEFT_PRESS; - } - } else { - if (model == UIConstants.MODEL_NORMAL) { - button = UIConstants.DRAG_RIGHT_NORMAL; - } else { - button = UIConstants.DRAG_RIGHT_PRESS; - } - } - SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, 10, ARROW_MARGIN_VERTICAL, VerticalToolPane.this)); - } - if (isLeftRightDragEnabled) { - g.drawImage(UIConstants.DRAG_DOT_VERTICAL, 2, getHeight() / 2, 5, toolPaneHeight, null); - } - } } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java index 55ba64b0e9..d7443a7620 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java @@ -1,12 +1,10 @@ package com.fr.design.gui.icontainer; -import com.fr.design.constants.UIConstants; import com.fr.design.gui.iscrollbar.UIScrollBar; import javax.swing.JScrollBar; import javax.swing.JScrollPane; import javax.swing.ScrollPaneConstants; -import java.awt.Color; import java.awt.Component; /** @@ -16,7 +14,7 @@ import java.awt.Component; public class UIScrollPane extends JScrollPane { private static final long serialVersionUID = 1L; - private static final int INCREAMENT = 30; + private static final int INCREMENT = 30; public UIScrollPane(Component c) { this(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); @@ -25,32 +23,24 @@ public class UIScrollPane extends JScrollPane { public UIScrollPane(Component c, int vertical, int horizontal) { super(c, vertical, horizontal); this.setHorizontalScrollBar(createHorizontalScrollBar()); - this.getVerticalScrollBar().setUnitIncrement(INCREAMENT); - this.getVerticalScrollBar().setBlockIncrement(INCREAMENT); - this.getHorizontalScrollBar().setOpaque(true); - this.getHorizontalScrollBar().setBackground(Color.WHITE); - this.getVerticalScrollBar().setOpaque(true); - this.getVerticalScrollBar().setBackground(Color.WHITE); + this.getVerticalScrollBar().setUnitIncrement(INCREMENT); + this.getVerticalScrollBar().setBlockIncrement(INCREMENT); } - @Override /** * 生成水平滚动条 */ + @Override public UIScrollBar createHorizontalScrollBar() { - UIScrollBar sbr = new UIScrollBar(JScrollBar.HORIZONTAL); - sbr.setBackground(UIConstants.NORMAL_BACKGROUND); - return sbr; + return new UIScrollBar(JScrollBar.HORIZONTAL); } - @Override /** * 生成垂直滚动条 */ + @Override public UIScrollBar createVerticalScrollBar() { - UIScrollBar sbr = new UIScrollBar(JScrollBar.VERTICAL); - sbr.setBackground(UIConstants.NORMAL_BACKGROUND); - return sbr; + return new UIScrollBar(JScrollBar.VERTICAL); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UITableScrollPane.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UITableScrollPane.java new file mode 100644 index 0000000000..2d0807409b --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UITableScrollPane.java @@ -0,0 +1,23 @@ +package com.fr.design.gui.icontainer; + +import com.fr.design.gui.iscrollbar.UIVerticalScrollBar; + +import javax.swing.JScrollBar; +import javax.swing.JTable; +import java.awt.Component; + +/** + * FineUITable 定义垂直滚动条 {@link UIVerticalScrollBar} + * @author lemon + * @since + * Created on + */ +public class UITableScrollPane extends UIScrollPane { + + public UITableScrollPane(Component c) { + super(c); + if (c instanceof JTable) { + setVerticalScrollBar(new UIVerticalScrollBar((JTable) c, JScrollBar.VERTICAL)); + } + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java b/designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java index c98455a58f..b4dc77e923 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilable/ActionLabel.java @@ -1,5 +1,7 @@ package com.fr.design.gui.ilable; +import com.formdev.flatlaf.ui.FlatUIUtils; + import javax.swing.event.MouseInputAdapter; import java.awt.Color; import java.awt.Cursor; @@ -13,12 +15,12 @@ import java.awt.event.MouseEvent; */ public class ActionLabel extends UILabel { private ActionListener actionListener; - private Color color; + private final Color color; // 文字是否有下划线 private boolean drawUnderLine = true; public ActionLabel(String text) { - this(text, Color.blue); + this(text, FlatUIUtils.getUIColor("Label.hyperLinkColor", Color.BLUE)); } public ActionLabel(String text, boolean drawUnderLine) { diff --git a/designer-base/src/main/java/com/fr/design/gui/ilable/FRExplainLabel.java b/designer-base/src/main/java/com/fr/design/gui/ilable/FRExplainLabel.java index d0c5f4a496..e4224535c3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilable/FRExplainLabel.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilable/FRExplainLabel.java @@ -1,10 +1,9 @@ package com.fr.design.gui.ilable; -import java.awt.Color; +import com.fine.theme.utils.FineUIStyle; import javax.swing.Icon; import javax.swing.ImageIcon; -import com.fr.design.gui.ilable.UILabel; public class FRExplainLabel extends UILabel { @@ -19,6 +18,6 @@ public class FRExplainLabel extends UILabel { private void init(){ setIcon(icon); - setForeground(new Color(255, 0, 0)); + FineUIStyle.setStyle(this, FineUIStyle.LABEL_WARNING_TIP); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/ilable/UILabel.java b/designer-base/src/main/java/com/fr/design/gui/ilable/UILabel.java index d6a7952757..c49f040d2f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilable/UILabel.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilable/UILabel.java @@ -1,5 +1,6 @@ package com.fr.design.gui.ilable; +import com.fine.theme.utils.FineUIStyle; import com.fr.design.gui.core.UITextComponent; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.StringUtils; @@ -37,6 +38,11 @@ public class UILabel extends JLabel implements UITextComponent { super(text); } + public UILabel(String text, String style) { + super(text); + FineUIStyle.setStyle(this, style); + } + public UILabel(String text, boolean enable) { super(text); this.setEnabled(enable); diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java index f4c3cfe920..4c9135e151 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java @@ -1,5 +1,6 @@ package com.fr.design.gui.ilist; +import com.fine.theme.utils.FineUIScale; import com.fr.design.gui.NameInspector; import com.fr.design.gui.itextfield.UITextField; import com.fr.general.GeneralUtils; @@ -256,7 +257,7 @@ public class JNameEdList extends UIList implements CellEditorListener { } public int getIconWidth() { - return ICON_WIDTH; + return FineUIScale.scale(ICON_WIDTH); } public Rectangle createRect(Rectangle rect, int iconWidth) { diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java index b6b3a8819a..b0483dfdd3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java @@ -1,5 +1,8 @@ package com.fr.design.gui.ilist; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fanruan.config.impl.data.ConnectionConfigProviderFactory; import com.fr.base.BaseUtils; import com.fr.data.core.DataCoreUtils; @@ -25,7 +28,9 @@ import javax.swing.Icon; import javax.swing.JList; import javax.swing.ListSelectionModel; import javax.swing.SwingWorker; +import java.awt.Color; import java.awt.Component; +import java.awt.Dimension; import java.awt.dnd.DnDConstants; import java.awt.dnd.DragGestureEvent; import java.awt.dnd.DragGestureListener; @@ -56,9 +61,10 @@ public class TableViewList extends UIList { public TableViewList() { super(); - this.setBackground(UIConstants.NORMAL_BACKGROUND); +// this.setBackground(UIConstants.NORMAL_BACKGROUND); this.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION); this.setCellRenderer(new TableListCellRenderer()); + this.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); new TableProcessorTreeDragSource(this, DnDConstants.ACTION_COPY); this.addFocusListener(new FocusAdapter() { @@ -255,16 +261,21 @@ public class TableViewList extends UIList { String type = tableProcedure == null ? null : tableProcedure.getType(); Icon icon = null; if (ComparatorUtils.equals(type, TableProcedure.TABLE)) { - icon = BaseUtils.readIcon("/com/fr/design/images/data/tables.png"); + icon = new LazyIcon("tables"); } else if (ComparatorUtils.equals(type, TableProcedure.VIEW)) { - icon = BaseUtils.readIcon("/com/fr/design/images/data/views.png"); + icon = new LazyIcon("views"); } else { - icon = BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png"); + icon = new LazyIcon("store_procedure"); } this.setIcon(icon); return this; } + + @Override + public Dimension getPreferredSize() { + return new Dimension(super.getPreferredSize().width, FineUIScale.scale(24)); + } } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java index 131adbed7a..d1ec33486d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java @@ -1,11 +1,14 @@ package com.fr.design.gui.ilist; +import com.fine.theme.utils.FineUIStyle; import com.fr.general.NameObject; import com.fr.stable.Nameable; import javax.swing.ListModel; import java.awt.Point; +import static com.fine.theme.utils.FineUIStyle.setStyle; + /** * Created by plough on 2017/7/23. */ @@ -14,6 +17,7 @@ public class UINameEdList extends JNameEdList { protected UINameEdList(ListModel dataModel) { super(dataModel); + setStyle(this, FineUIStyle.NO_BORDER_LIST); } public Object getType(int index) { diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIHeadMenu.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIHeadMenu.java index e196f90a5f..f71abbaec8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIHeadMenu.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIHeadMenu.java @@ -1,20 +1,15 @@ package com.fr.design.gui.imenu; -import com.fr.design.constants.UIConstants; -import com.fr.design.utils.gui.GUIPaintUtils; +import com.fine.theme.utils.FineUIUtils; import javax.swing.Action; import javax.swing.JButton; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.MenuElement; -import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; import java.awt.Component; -import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.Insets; -import java.awt.RenderingHints; -import java.awt.Shape; /** * @author null @@ -25,54 +20,43 @@ public class UIHeadMenu extends UIMenu { public UIHeadMenu(String name) { super(name); + setBorder(new EmptyBorder(FineUIUtils.getAndScaleUIInsets("HeadMenu.borderMargins", new Insets(5, 9, 5, 10)))); } @Override public JPopupMenu getPopupMenu() { ensurePopupMenuCreated(); - popupMenu.setBackground(UIConstants.NORMAL_BACKGROUND); - popupMenu.setBorder(new Border() { - - @Override - public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { - Graphics2D g2d = (Graphics2D) g; - int rec = (int) REC; - GUIPaintUtils.paintShapeBorder(g2d, x, y, width, height, rec); - if (!(UIHeadMenu.this.getParent() instanceof JPopupMenu)) { - g.setColor(UIConstants.NORMAL_BACKGROUND); - g.drawLine(1, 0, UIHeadMenu.this.getWidth() - 2, 0); - } - } - - @Override - public boolean isBorderOpaque() { - return false; - } - - @Override - public Insets getBorderInsets(Component c) { - return new Insets(5, 2, 10, 10); - } - }); +// popupMenu.setBackground(UIConstants.NORMAL_BACKGROUND); +// popupMenu.setBorder(new Border() { +// +// @Override +// public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { +// Graphics2D g2d = (Graphics2D) g; +// int rec = (int) REC; +// GUIPaintUtils.paintShapeBorder(g2d, x, y, width, height, rec); +// if (!(UIHeadMenu.this.getParent() instanceof JPopupMenu)) { +// g.setColor(UIConstants.NORMAL_BACKGROUND); +// g.drawLine(1, 0, UIHeadMenu.this.getWidth() - 2, 0); +// } +// } +// +// @Override +// public boolean isBorderOpaque() { +// return false; +// } +// +// @Override +// public Insets getBorderInsets(Component c) { +// return new Insets(5, 2, 10, 10); +// } +// }); return popupMenu; } @Override protected void ensurePopupMenuCreated() { if (popupMenu == null) { - this.popupMenu = new JPopupMenu() { - @Override - protected void paintComponent(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - float width = getWidth(); - float height = getHeight(); - - Shape shape = GUIPaintUtils.paintShape(g2d, width, height, REC); - g2d.setClip(shape); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - super.paintComponent(g2d); - } - }; + this.popupMenu = new JPopupMenu(); popupMenu.setInvoker(this); popupListener = createWinListener(popupMenu); } diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java index c609e5d5c7..eaa368a4f7 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java @@ -1,5 +1,6 @@ package com.fr.design.gui.imenu; +import com.fine.theme.utils.FineClientProperties; import com.fr.design.editlock.EditLockChangeEvent; import com.fr.design.editlock.EditLockChangeListener; import com.fr.report.LockItem; @@ -32,7 +33,6 @@ public class UILockMenuItem extends UIMenuItem implements EditLockChangeListener this.lockedTooltips = lockedTooltips; this.normalTooltips = normalTooltips; this.lockItem = lockItem; - setUI(new UILockMenuItemUI()); } public LockItem getLockItem() { @@ -42,6 +42,11 @@ public class UILockMenuItem extends UIMenuItem implements EditLockChangeListener @Override public void updateLockedState(EditLockChangeEvent event) { this.setToolTipText(event.isLocked() ? lockedTooltips : normalTooltips); + if (event.isLocked()) { + this.putClientProperty(FineClientProperties.MENU_ITEM_TYPE, FineClientProperties.MENU_ITEM_TYPE_LOCK); + } else { + this.putClientProperty(FineClientProperties.MENU_ITEM_TYPE, null); + } this.repaint(); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java index c0f70795bb..7601b70ad1 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItemUI.java @@ -18,11 +18,11 @@ public class UILockMenuItemUI extends UIMenuItemUI{ super.paintText(g, menuItem, textRect, text); // 除了绘制text之外，还需要画一下锁定图标 UILockMenuItem lockMenuItem = (UILockMenuItem) menuItem; - if (EditLockUtils.isLocked(lockMenuItem.getLockItem())) { +// if (EditLockUtils.isLocked(lockMenuItem.getLockItem())) { int width = menuItem.getWidth(); int height = menuItem.getHeight(); g.drawImage(EditLockUtils.LOCKED_IMAGE, (int) Math.round(width * 0.9), (int) Math.round(height * 0.1), 16, 16, null); - } +// } } } diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenu.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenu.java index 98f60619b9..ec78046709 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenu.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenu.java @@ -1,106 +1,95 @@ package com.fr.design.gui.imenu; -import com.fr.design.constants.UIConstants; -import com.fr.stable.StringUtils; - import javax.swing.Action; import javax.swing.JButton; import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.MenuElement; -import javax.swing.border.Border; import java.awt.Component; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.RenderingHints; -import java.awt.Shape; -import java.awt.geom.RoundRectangle2D; /** * @author null */ public class UIMenu extends JMenu { - private static final float REC = 8f; private JPopupMenu popupMenu; public UIMenu(String name) { super(name); setName(name); setRolloverEnabled(true); - setBackground(UIConstants.NORMAL_BACKGROUND); +// setBackground(UIConstants.NORMAL_BACKGROUND); } - @Override - public String getText() { - if (this.getParent() instanceof JPopupMenu) { - return StringUtils.BLANK + super.getText(); - } - return " " + super.getText(); - } +// @Override +// public String getText() { +// if (this.getParent() instanceof JPopupMenu) { +// return super.getText(); +// } +// return super.getText(); +// } @Override public JPopupMenu getPopupMenu() { ensurePopupMenuCreated(); popupMenu.setOpaque(false); - popupMenu.setBorder(new Border() { - - @Override - public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { - Graphics2D g2d = (Graphics2D) g; - int rec = (int) REC; - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - g2d.setColor(UIConstants.UIPOPUPMENU_LINE_COLOR); - g2d.drawRoundRect(x, y, width - 1, height - 1, rec, rec); - if (!(UIMenu.this.getParent() instanceof JPopupMenu)) { - g.setColor(UIConstants.NORMAL_BACKGROUND); - g.drawLine(1, 0, UIMenu.this.getWidth() - 2, 0); - } - } - - @Override - public boolean isBorderOpaque() { - return false; - } - - @Override - public Insets getBorderInsets(Component c) { - return new Insets(5, 2, 10, 10); - } - }); +// popupMenu.setBorder(new Border() { +// +// @Override +// public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { +// Graphics2D g2d = (Graphics2D) g; +// int rec = (int) REC; +// g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); +// g2d.setColor(UIConstants.UIPOPUPMENU_LINE_COLOR); +// g2d.drawRoundRect(x, y, width - 1, height - 1, rec, rec); +// if (!(UIMenu.this.getParent() instanceof JPopupMenu)) { +// g.setColor(UIConstants.NORMAL_BACKGROUND); +// g.drawLine(1, 0, UIMenu.this.getWidth() - 2, 0); +// } +// } +// +// @Override +// public boolean isBorderOpaque() { +// return false; +// } +// +// @Override +// public Insets getBorderInsets(Component c) { +// return new Insets(5, 2, 10, 10); +// } +// }); return popupMenu; } protected void ensurePopupMenuCreated() { if (popupMenu == null) { - this.popupMenu = new JPopupMenu() { - @Override - protected void paintComponent(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - int rec = (int) REC; - Shape shape = new RoundRectangle2D.Double(0, 0, getWidth(), getHeight(), REC, REC); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(UIConstants.NORMAL_BACKGROUND); - g2d.fillRoundRect(0, 0, getWidth(), getHeight(), rec, rec); - g2d.setClip(shape); - super.paintComponent(g2d); - } - - }; + this.popupMenu = new JPopupMenu(); +// @Override +// protected void paintComponent(Graphics g) { +// Graphics2D g2d = (Graphics2D) g; +// int rec = (int) REC; +// Shape shape = new RoundRectangle2D.Double(0, 0, getWidth(), getHeight(), REC, REC); +// g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); +// g2d.setColor(UIConstants.NORMAL_BACKGROUND); +// g2d.fillRoundRect(0, 0, getWidth(), getHeight(), rec, rec); +// g2d.setClip(shape); +// super.paintComponent(g2d); +// } +// +// }; popupMenu.setInvoker(this); popupListener = createWinListener(popupMenu); } } - /** - * 画界面 - */ - @Override - public void updateUI() { - setUI(new UIMenuUI()); - } +// /** +// * 画界面 +// */ +// @Override +// public void updateUI() { +// setUI(new UIMenuUI()); +// } /** * 判断popupmeu是否隐藏 diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuBar.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuBar.java index 6f7a68c83c..37248a2490 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuBar.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuBar.java @@ -12,7 +12,7 @@ import javax.swing.border.EmptyBorder; */ public class UIMenuBar extends JMenuBar { - private static final int LEFT_GAP = 5; + private static final int LEFT_GAP = 10; public UIMenuBar() { super(); @@ -23,7 +23,7 @@ public class UIMenuBar extends JMenuBar { /** * 更新UI */ - public void updateUI() { - setUI(new UIMenuBarUI()); - } +// public void updateUI() { +// setUI(new UIMenuBarUI()); +// } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuBarUI.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuBarUI.java index a93b1d23db..a0f073ce2b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuBarUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuBarUI.java @@ -1,9 +1,6 @@ package com.fr.design.gui.imenu; -import com.fr.design.constants.UIConstants; - import javax.swing.plaf.basic.BasicMenuBarUI; -import java.awt.*; /** * Created by IntelliJ IDEA. @@ -23,10 +20,8 @@ public class UIMenuBarUI extends BasicMenuBarUI { if (!c.isOpaque()) { return; } - Color oldColor = g.getColor(); - g.setColor(UIConstants.UI_MENU_BACKGOURND); - g.fillRect(0, 0, c.getWidth(), c.getHeight()); - g.setColor(oldColor); +// g.setColor(UIManager.getColor("Menu.background")); +// g.fillRect(0, 0, c.getWidth(), c.getHeight()); } diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuEastAttrItem.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuEastAttrItem.java index 0df132caf4..e85284c717 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuEastAttrItem.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuEastAttrItem.java @@ -26,14 +26,14 @@ public class UIMenuEastAttrItem extends JMenuItem { public UIMenuEastAttrItem(String string, Icon pageSmallIcon) { super(string, pageSmallIcon); - setBackground(UIConstants.NORMAL_BACKGROUND); - setUI(new UIMenuItemEastAttrUI()); +// setBackground(UIConstants.NORMAL_BACKGROUND); +// setUI(new UIMenuItemEastAttrUI()); } public UIMenuEastAttrItem(String string, int key) { super(string, key); - setBackground(UIConstants.NORMAL_BACKGROUND); - setUI(new UIMenuItemEastAttrUI()); +// setBackground(UIConstants.NORMAL_BACKGROUND); +// setUI(new UIMenuItemEastAttrUI()); } public UIMenuEastAttrItem(Action action) { @@ -43,7 +43,7 @@ public class UIMenuEastAttrItem extends JMenuItem { @Override public String getText() { - return StringUtils.BLANK + super.getText(); + return super.getText(); } private class UIMenuItemEastAttrUI extends BasicMenuItemUI { @@ -57,7 +57,7 @@ public class UIMenuEastAttrItem extends JMenuItem { Color oldColor = g.getColor(); int menuWidth = menuItem.getWidth(); int menuHeight = menuItem.getHeight(); - g.setColor(UIConstants.NORMAL_BACKGROUND); +// g.setColor(UIConstants.NORMAL_BACKGROUND); g.fillRect(0, 0, menuWidth, menuHeight); if (menuItem.isOpaque()) { diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuHighLight.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuHighLight.java deleted file mode 100644 index 6fb127e5ca..0000000000 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuHighLight.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.fr.design.gui.imenu; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics; - -import javax.swing.JPanel; - -import com.fr.design.constants.UIConstants; - -public class UIMenuHighLight extends JPanel{ - - @Override - public Dimension getPreferredSize() { - Dimension dim = super.getPreferredSize(); - dim.height = 0; - return dim; - } - public void paint(Graphics g) { - g.setColor(UIConstants.LINE_COLOR); - g.drawLine(0, 0, getWidth(), 0); - g.setColor(Color.WHITE); - g.drawLine(0, 1, getWidth(), 1); - }; -} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuItem.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuItem.java index 3230dbda21..337799dca3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuItem.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuItem.java @@ -1,6 +1,5 @@ package com.fr.design.gui.imenu; -import com.fr.design.constants.UIConstants; import com.fr.stable.StringUtils; import javax.swing.Action; @@ -9,7 +8,7 @@ import javax.swing.JMenuItem; public class UIMenuItem extends JMenuItem{ public UIMenuItem() { - this(StringUtils.BLANK); + this(StringUtils.EMPTY); } public UIMenuItem(String string) { @@ -19,14 +18,14 @@ public class UIMenuItem extends JMenuItem{ public UIMenuItem(String string, Icon pageSmallIcon) { super(string, pageSmallIcon); - setBackground(UIConstants.NORMAL_BACKGROUND); - setUI(new UIMenuItemUI()); +// setBackground(UIConstants.NORMAL_BACKGROUND); +// setUI(new UIMenuItemUI()); } public UIMenuItem(String string, int key) { super(string, key); - setBackground(UIConstants.NORMAL_BACKGROUND); - setUI(new UIMenuItemUI()); +// setBackground(UIConstants.NORMAL_BACKGROUND); +// setUI(new UIMenuItemUI()); } public UIMenuItem(Action action) { @@ -34,9 +33,4 @@ public class UIMenuItem extends JMenuItem{ setAction(action); } - @Override - public String getText() { - return StringUtils.BLANK + super.getText(); - } - } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIPopupEastAttrMenu.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIPopupEastAttrMenu.java index 42b04e03af..a7d7144e19 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIPopupEastAttrMenu.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIPopupEastAttrMenu.java @@ -1,28 +1,11 @@ package com.fr.design.gui.imenu; -import java.awt.Graphics; -import java.awt.Insets; - import javax.swing.JPopupMenu; -import com.fr.design.constants.UIConstants; - public class UIPopupEastAttrMenu extends JPopupMenu { public UIPopupEastAttrMenu() { super(); - setBackground(UIConstants.NORMAL_BACKGROUND); - } - - @Override - protected void paintBorder(Graphics g) { - g.setColor(UIConstants.POP_DIALOG_BORDER); - g.drawRect(0, 0, getWidth() - 1, getHeight() - 1); - } - - @Override - public Insets getInsets() { - return new Insets(0, 1, 1, 1); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIPopupMenu.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIPopupMenu.java index 3aeaa186be..b09989f95b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIPopupMenu.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIPopupMenu.java @@ -1,11 +1,6 @@ package com.fr.design.gui.imenu; -import java.awt.*; -import java.awt.geom.RoundRectangle2D; - -import javax.swing.*; - -import com.fr.design.constants.UIConstants; +import javax.swing.JPopupMenu; public class UIPopupMenu extends JPopupMenu{ private static final float DEFAULT_REC = 8f; @@ -15,32 +10,6 @@ public class UIPopupMenu extends JPopupMenu{ public static UIPopupMenu EMPTY = new UIPopupMenu(); public UIPopupMenu() { super(); - setBackground(UIConstants.NORMAL_BACKGROUND); - } - - @Override - protected void paintComponent(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - Shape shape = new RoundRectangle2D.Double(0, 0, getWidth(), getHeight(), rec, rec); - g2d.setClip(shape); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - super.paintComponent(g2d); - } - - @Override - protected void paintBorder(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - g2d.setColor(UIConstants.UIPOPUPMENU_LINE_COLOR); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.drawRoundRect(0, 0, getWidth() - 1, getHeight() - 1, (int) rec, (int) rec); - } - - @Override - public Insets getInsets() { - if(onlyText) { - return super.getInsets(); - } - return new Insets(10, 2, 10, 10); } public void setOnlyText(boolean onlyText) { diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenu.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenu.java index 1d176c384c..dff9d24a81 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenu.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenu.java @@ -68,13 +68,13 @@ public class UIScrollMenu extends UIMenu { //// All of these methods are necessary because ensurePopupMenuCreated() is private in JMenu ////////////////////////////// - /** - * 画界面 - */ - @Override - public void updateUI() { - setUI(new UIMenuUI()); - } +// /** +// * 画界面 +// */ +// @Override +// public void updateUI() { +// setUI(new UIMenuUI()); +// } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollPopUpMenu.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollPopUpMenu.java index c2713fc26a..80c379a7c5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollPopUpMenu.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollPopUpMenu.java @@ -1,14 +1,16 @@ package com.fr.design.gui.imenu; -import com.fr.design.constants.UIConstants; import com.fr.design.gui.iscrollbar.UIScrollBar; -import java.awt.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Insets; +import java.awt.LayoutManager; import java.awt.event.AdjustmentEvent; import java.awt.event.AdjustmentListener; import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; /** * Author : daisy @@ -17,7 +19,6 @@ import java.awt.event.MouseWheelListener; */ public class UIScrollPopUpMenu extends UIPopupMenu { private static final int MAX_SHOW_NUM = 27; - private static final float REC = 8f; private UIScrollBar scrollBar; @@ -26,31 +27,17 @@ public class UIScrollPopUpMenu extends UIPopupMenu { setOpaque(false); setLayout(new ScrollPopupMenuLayout()); super.add(getScrollBar()); - addMouseWheelListener(new MouseWheelListener() { - public void mouseWheelMoved(MouseWheelEvent e) { - UIScrollBar scrollBar = getScrollBar(); - int amount = (e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) - ? e.getUnitsToScroll() * scrollBar.getUnitIncrement() - : (e.getWheelRotation() < 0 ? -1 : 1) * scrollBar.getBlockIncrement(); - - scrollBar.setValue(scrollBar.getValue() + amount); - e.consume(); - } + addMouseWheelListener(e -> { + UIScrollBar scrollBar = getScrollBar(); + int amount = (e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) + ? e.getUnitsToScroll() * scrollBar.getUnitIncrement() + : (e.getWheelRotation() < 0 ? -1 : 1) * scrollBar.getBlockIncrement(); + + scrollBar.setValue(scrollBar.getValue() + amount); + e.consume(); }); } - - public void paintChildren(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - int rec = (int) REC; - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(UIConstants.NORMAL_BACKGROUND); - g2d.fillRoundRect(1, 1, getWidth() - 2, getHeight() - 2, rec, rec); - Insets insets = getInsets(); - g.clipRect(insets.left, insets.top, getWidth(), getHeight() - insets.top - insets.bottom); - super.paintChildren(g); - } - /** * 展现 popupmenu * @param invoker 组件 @@ -197,7 +184,7 @@ public class UIScrollPopUpMenu extends UIPopupMenu { public void layoutContainer(Container parent) { Insets insets = parent.getInsets(); - int width = parent.getPreferredSize().width - insets.left - insets.right; + int width = parent.getWidth() - insets.left - insets.right; int height = parent.getHeight() - insets.top - insets.bottom; int x = insets.left; @@ -208,13 +195,13 @@ public class UIScrollPopUpMenu extends UIPopupMenu { if ((comp instanceof UIScrollBar) && comp.isVisible()) { UIScrollBar scrollBar = (UIScrollBar) comp; Dimension dim = scrollBar.getPreferredSize(); - scrollBar.setBounds(x + width - 1, y, dim.width, height); + scrollBar.setBounds(x + width - dim.width, y, dim.width, height); width -= dim.width; position = scrollBar.getValue(); } } - y -= position; + y = insets.top - position; for (Component comp : parent.getComponents()) { if (!(comp instanceof UIScrollBar) && comp.isVisible()) { Dimension pref = comp.getPreferredSize(); @@ -222,7 +209,6 @@ public class UIScrollPopUpMenu extends UIPopupMenu { y += pref.height; } } - } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java index 938e0caccc..764085a709 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java @@ -6,226 +6,239 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.UIDialog; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itable.UITable; -import com.fr.design.hyperlink.ReportletHyperlinkPane; -import com.fr.design.hyperlink.WebHyperlinkPane; -import com.fr.design.javascript.EmailPane; import com.fr.design.utils.gui.GUICoreUtils; +import org.jetbrains.annotations.NotNull; -import com.fr.js.EmailJavaScript; -import com.fr.js.ReportletHyperlink; -import com.fr.js.WebHyperlink; - -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JTable; +import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.plaf.TableUI; import javax.swing.table.TableCellRenderer; -import java.awt.*; -import java.util.ArrayList; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; import java.util.List; public class UIMenuTable extends JTable { - protected int selectedRowIndex = -1; - protected int rollOverRowIndex = -1; - protected int draggingIndex = -1; - - public UIMenuTable() { - super(new UIMenuTableDataModel()); - initComponents(); - } - - public void populateBean(List values) { - ((UIMenuTableDataModel)dataModel).populateBean(values); - } - - public List updateBean() { - return ((UIMenuTableDataModel)dataModel).updateBean(); - } - - public void editingEvent(int rowIndex, int mouseY) { - selectedRowIndex = rowIndex; - repaint(); - - final UIMenuNameableCreator nameObject = UIMenuTable.this.getLine(rowIndex); - - final BasicBeanPane baseShowPane = nameObject.getPane(); - - final Object showValue = nameObject.getObj(); - - baseShowPane.populateBean(showValue); + private static final int STEP = 2; + protected int selectedRowIndex = -1; + protected int rollOverRowIndex = -1; + protected int draggingIndex = -1; + + public UIMenuTable() { + super(new UIMenuTableDataModel()); + initComponents(); + } + + /** + * 传入列表数据 + * + * @param values 数据 + */ + public void populateBean(List values) { + ((UIMenuTableDataModel) dataModel).populateBean(values); + } + + /** + * 获取模型中数据 + * + * @return 数据 + */ + public List updateBean() { + return ((UIMenuTableDataModel) dataModel).updateBean(); + } + + /** + * 编辑事件 + * + * @param rowIndex 行索引 + * @param mouseY mouseY + */ + public void editingEvent(int rowIndex, int mouseY) { + selectedRowIndex = rowIndex; + repaint(); + + final UIMenuNameableCreator nameObject = UIMenuTable.this.getLine(rowIndex); + + final BasicBeanPane baseShowPane = nameObject.getPane(); + + final Object showValue = nameObject.getObj(); + + baseShowPane.populateBean(showValue); UIDialog dialog = baseShowPane.showUnsizedWindow(SwingUtilities.getWindowAncestor(new JPanel()), new DialogActionAdapter() { - public void doOk() { - baseShowPane.updateBean(showValue); - fireTargetChanged(); - } - }); - - dialog.setSize(500, 600); - GUICoreUtils.centerWindow(dialog); - - dialog.setVisible(true); - } - - protected Color getRenderBackground(int row) { - if(selectedRowIndex == row ) { - return UIConstants.SKY_BLUE; - } else { - return (rollOverRowIndex == row) ? UIConstants.LIGHT_BLUE : UIConstants.NORMAL_BACKGROUND; - } - } - - /** - * - * @param value 该行列的值(字符串) - * @param row - * @param column - * @return 列表中默认显示的东西，如果有很多内容，可以装载一个JPanel里再嵌进来 - */ - protected JComponent getRenderCompoment(Object value, int row,int column) { - UILabel text = new UILabel(); - if(value != null) { - text.setText(value.toString()); - } - return text; - } - - /** - * @param line 该行的内容 - * 在table底部增加一行内容 - */ - public void addLine(UIMenuNameableCreator line) { - ((UIMenuTableDataModel)dataModel).addLine(line); - } - - /** - * @param rowIndex - * @return 某一行的内容 - */ - public UIMenuNameableCreator getLine(int rowIndex) { - return ((UIMenuTableDataModel)dataModel).getLine(rowIndex); - } - - /** - * 删除某行内容 - * @param rowIndex - */ - public void removeLine(int rowIndex) { - ((UIMenuTableDataModel)dataModel).removeLine(rowIndex); - } - - /** - * 清除所有的内容 - */ - public void clearAll() { - int rowCount = dataModel.getRowCount(); - for(int i = 0; i < rowCount; i++) { - removeLine(i); - } - } - - /** - * 对某一行拖动时进行排序 - * @param rowIndex - * @param positive 鼠标移动的距离 - */ - public void dragSort(int rowIndex, boolean positive) { - ((UIMenuTableDataModel)dataModel).dragSort(rowIndex, positive); - } - - @Override - public boolean isCellEditable(int row, int column) { - if(column == 0) { - return false; - } else { - return super.isCellEditable(row, column); - } - } - - @Override - public TableUI getUI() { - return new UIMenuTableUI(); - } - - private void initComponents() { - setShowGrid(false); - setRowHeight(20); - setDragEnabled(false); - setDefaultRenderer(UITable.class, new UITableRender()); - setUI(getUI()); - } - - @Override - public TableCellRenderer getDefaultRenderer(Class columnClass) { - return super.getDefaultRenderer(UITable.class); - } - - private class UITableRender implements TableCellRenderer { - @Override - public Component getTableCellRendererComponent(JTable table, - Object value, boolean isSelected, boolean hasFocus, int row, - int column) { - JPanel pane = new JPanel(new BorderLayout(4,0)); - Color back = getRenderBackground(row); - pane.setBackground(back); - - if(draggingIndex == row) { - return pane; - } - pane.add(getRenderCompoment(value, row, column), BorderLayout.CENTER); - return pane; - } - } - - protected void setRollOverRowIndex(int rowIndex) { - this.rollOverRowIndex = rowIndex; - } - - protected void setDraggingRowIndex(int rowIndex) { - this.draggingIndex = rowIndex; - } - - public void fireTargetChanged() { - repaint(); - Object[] listeners = listenerList.getListenerList(); - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == ChangeListener.class) { - ((ChangeListener)listeners[i + 1]).stateChanged(new ChangeEvent(this)); - } - } - } - - public void addChangeListener(ChangeListener l) { - this.listenerList.add(ChangeListener.class, l); - } - - public void removeChangeListener(ChangeListener l) { - this.listenerList.remove(ChangeListener.class, l); - } - - public static void main(String... args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel)jf.getContentPane(); - content.setLayout(new BorderLayout()); - List data = new ArrayList(); - UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reportlet"), - new ReportletHyperlink(), ReportletHyperlinkPane.class); - - UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), - new EmailJavaScript(), EmailPane.class); - - UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), - new WebHyperlink(), WebHyperlinkPane.class ); - data.add(reportlet); - data.add(email); - data.add(web); - UIMenuTable pane = new UIMenuTable(); - pane.populateBean(data); - content.add(pane, BorderLayout.CENTER); - GUICoreUtils.centerWindow(jf); - jf.setSize(400, 400); - jf.setVisible(true); - } + public void doOk() { + baseShowPane.updateBean(showValue); + fireTargetChanged(); + } + }); + + dialog.setSize(500, 600); + GUICoreUtils.centerWindow(dialog); + + dialog.setVisible(true); + } + + protected Color getRenderBackground(int row) { + if (selectedRowIndex == row) { + return UIConstants.SKY_BLUE; + } else { + return (rollOverRowIndex == row) ? UIConstants.LIGHT_BLUE : UIConstants.NORMAL_BACKGROUND; + } + } + + /** + * @param value 该行列的值(字符串) + * @param row + * @param column + * @return 列表中默认显示的东西，如果有很多内容，可以装载一个JPanel里再嵌进来 + */ + protected JComponent getRenderCompoment(Object value, int row, int column) { + UILabel text = new UILabel(); + if (value != null) { + text.setText(value.toString()); + } + return text; + } + + /** + * @param line 该行的内容 + * 在table底部增加一行内容 + */ + public void addLine(UIMenuNameableCreator line) { + ((UIMenuTableDataModel) dataModel).addLine(line); + } + + /** + * @param rowIndex + * @return 某一行的内容 + */ + public UIMenuNameableCreator getLine(int rowIndex) { + return ((UIMenuTableDataModel) dataModel).getLine(rowIndex); + } + + /** + * 删除某行内容 + * + * @param rowIndex + */ + public void removeLine(int rowIndex) { + ((UIMenuTableDataModel) dataModel).removeLine(rowIndex); + } + + /** + * 清除所有的内容 + */ + public void clearAll() { + int rowCount = dataModel.getRowCount(); + for (int i = 0; i < rowCount; i++) { + removeLine(i); + } + } + + /** + * 对某一行拖动时进行排序 + * + * @param rowIndex + * @param positive 鼠标移动的距离 + */ + public void dragSort(int rowIndex, boolean positive) { + ((UIMenuTableDataModel) dataModel).dragSort(rowIndex, positive); + } + + @Override + public boolean isCellEditable(int row, int column) { + if (column == 0) { + return false; + } else { + return super.isCellEditable(row, column); + } + } + + @Override + public TableUI getUI() { + return new UIMenuTableUI(); + } + + private void initComponents() { + setShowGrid(false); + setRowHeight(20); + setDragEnabled(false); + setDefaultRenderer(UITable.class, new UITableRender()); + setUI(getUI()); + } + + @Override + public TableCellRenderer getDefaultRenderer(Class columnClass) { + // 处理null的情况用于创建时未指定数据结构的情况 + if (columnClass == null) { + return createDefaultRenderer(); + } + return super.getDefaultRenderer(columnClass); + } + + private @NotNull TableCellRenderer createDefaultRenderer() { + Object renderer = defaultRenderersByColumnClass.get(UITable.class); + return renderer != null ? (TableCellRenderer) renderer : new UITableRender(); + } + + private class UITableRender implements TableCellRenderer { + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, int row, + int column) { + JPanel pane = new JPanel(new BorderLayout(4, 0)); + Color back = getRenderBackground(row); + pane.setBackground(back); + + if (draggingIndex == row) { + return pane; + } + pane.add(getRenderCompoment(value, row, column), BorderLayout.CENTER); + return pane; + } + } + + protected void setRollOverRowIndex(int rowIndex) { + this.rollOverRowIndex = rowIndex; + } + + protected void setDraggingRowIndex(int rowIndex) { + this.draggingIndex = rowIndex; + } + + /** + * 触发变更通知 + */ + public void fireTargetChanged() { + repaint(); + Object[] listeners = listenerList.getListenerList(); + + for (int i = listeners.length - STEP; i >= 0; i -= STEP) { + if (listeners[i] == ChangeListener.class) { + ((ChangeListener) listeners[i + 1]).stateChanged(new ChangeEvent(this)); + } + } + } + + /** + * 添加变更监听 + * + * @param l 监听对象 + */ + public void addChangeListener(ChangeListener l) { + this.listenerList.add(ChangeListener.class, l); + } + + /** + * 删除变更监听 + * + * @param l 监听对象 + */ + public void removeChangeListener(ChangeListener l) { + this.listenerList.remove(ChangeListener.class, l); + } } diff --git a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java index 44e697d043..ed975ef20d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java +++ b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java @@ -1,6 +1,6 @@ package com.fr.design.gui.iprogressbar; -import com.fr.design.constants.UIConstants; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.dialog.UIDialog; import com.fr.design.gui.ilable.UILabel; import com.fr.design.os.impl.SupportOSImpl; @@ -18,6 +18,8 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.Frame; +import static com.fine.theme.utils.FineUIScale.scale; + /** * 加载进度弹窗 * 使用注意点: @@ -28,7 +30,7 @@ import java.awt.Frame; public class ProgressDialog extends UIDialog { protected static final FRFont font = DesignUtils .getDefaultGUIFont() - .applySize(14) + .applySize(scale(14)) .applyForeground(new ColorUIResource(333334)); protected JProgressBar progressBar; @@ -58,7 +60,7 @@ public class ProgressDialog extends UIDialog { protected void initCenterDialog(Frame parent) { centerDialog = new JDialog(this); - centerDialog.setSize(new Dimension(482, 124)); + centerDialog.setSize(scale(new Dimension(482, 124))); centerDialog.setUndecorated(true); centerDialog.setLocationRelativeTo(parent); centerDialog.getContentPane().add(progressPanel); @@ -66,7 +68,6 @@ public class ProgressDialog extends UIDialog { protected void initProgressBar() { progressBar = new JProgressBar(); - progressBar.setUI(new ModernUIProgressBarUI()); progressBar.setBorderPainted(false); progressBar.setOpaque(false); progressBar.setBorder(null); @@ -75,8 +76,8 @@ public class ProgressDialog extends UIDialog { protected void initProgressPanel() { progressPanel = new JPanel(); - progressPanel.setBorder(new UIProgressBorder(3, UIConstants.DEFAULT_BG_RULER, 14, 46, 47, 37, 47)); - progressPanel.setLayout(new BorderLayout(4, 15)); + progressPanel.setBorder(new ScaledEmptyBorder(46, 47, 37, 47)); + progressPanel.setLayout(new BorderLayout(scale(4), scale(15))); progressPanel.add(progressBar, BorderLayout.CENTER); text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Project"), JLabel.CENTER); text.setFont(font); diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBar.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBar.java index 5cdd9cacd3..f91670eef0 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBar.java +++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBar.java @@ -1,7 +1,6 @@ package com.fr.design.gui.iscrollbar; import javax.swing.*; -import java.awt.*; /** * UIScrollBar是没有下上的按钮的,宽为8像素 @@ -11,40 +10,13 @@ import java.awt.*; */ public class UIScrollBar extends JScrollBar { - /** - * - */ - private static final long serialVersionUID = 1L; - private int temp = 10; + private static final long serialVersionUID = 1L; - public UIScrollBar(){ + public UIScrollBar() { } - public UIScrollBar(int orientation) { - super(orientation); - setUI(new UIScrollBarUI()); - } - - @Override - public Dimension getPreferredSize() { - return getOrientation() == UIScrollBar.VERTICAL ? - new Dimension(10, super.getPreferredSize().height) - : new Dimension(super.getPreferredSize().width, 10); - } - - @Override - /** - * 取得宽度 - */ - public int getWidth() { - return getOrientation() == UIScrollBar.VERTICAL ? temp : super.getWidth(); - } + public UIScrollBar(int orientation) { + super(orientation); + } - @Override - /** - * 取得高度 - */ - public int getHeight() { - return getOrientation() == UIScrollBar.HORIZONTAL ? temp : super.getHeight(); - } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIVerticalScrollBar.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIVerticalScrollBar.java new file mode 100644 index 0000000000..a323933db3 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIVerticalScrollBar.java @@ -0,0 +1,31 @@ +package com.fr.design.gui.iscrollbar; + +import javax.swing.JTable; + +/** + * jtable 垂直滚动条 + * + * @author lemon + * @since + * Created on + */ +public class UIVerticalScrollBar extends UIScrollBar { + private static final String UI_CLASS_ID = "TableVerticalBarUI"; + private static final long serialVersionUID = 1L; + + public JTable table; + + public UIVerticalScrollBar(JTable table, int orientation) { + super(orientation); + this.table = table; + } + + public String getUIClassID() { + return UI_CLASS_ID; + } + + public JTable getTable() { + return this.table; + } + +} diff --git a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java index a19db05060..b47d162a27 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java +++ b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java @@ -1,48 +1,54 @@ package com.fr.design.gui.ispinner; -import com.fr.design.constants.UIConstants; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; +import com.fr.design.event.HoverAware; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.ibutton.UIButtonUI; import com.fr.design.gui.itextfield.UINumberField; -import com.fr.design.utils.gui.GUIPaintUtils; import com.fr.stable.CommonUtils; -import com.fr.stable.Constants; import com.fr.stable.StringUtils; -import javax.swing.ButtonModel; +import javax.swing.BorderFactory; import javax.swing.Icon; -import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import javax.swing.plaf.ButtonUI; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.GridLayout; +import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; -public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver { - +import static com.fine.theme.utils.FineUIStyle.STYLE_TEXT; +import static com.fine.theme.utils.FineUIStyle.setStyle; + +/** + * Spinner类 + * + * @author anonymous + * @Created on 2023/12/12 + * @since 11.0 + */ +public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver, HoverAware { + + private final Insets defaultInsets = new Insets(0, 6, 0, 6); + private final int defaultButtonSize = 24; + private final int ICON_WIDTH = 12; protected double value; - private static final int SIZE = 20; - private static final int LEN = 13; - private static final int WIDTH = 13; - private static final int HEIGHT = 10; private static final int DEFAULT_NUMBERFIELD_COLUMNS = 2; private UINumberField textField; private UIButton preButton; @@ -60,6 +66,15 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver private int numberFieldColumns; private boolean textFieldFocus = false; + private boolean hover; + + private static final String UI_CLASS_ID = "InputUI"; + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + public UISpinner() { } @@ -99,6 +114,21 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver } }); } + + textField.addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent e) { + hover = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + hover = false; + repaint(); + } + }); + } /** @@ -144,6 +174,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver /** * 赋值但不触发保存,只是展现,一般是populate的时候用 + * * @param value */ public void setValueWithoutEvent(double value) { @@ -167,7 +198,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver } } - protected void setTextField(double value){ + protected void setTextField(double value) { textField.getDocument().removeDocumentListener(docListener); textField.setValue(value); textField.getDocument().addDocumentListener(docListener); @@ -190,7 +221,8 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver /** * 设置Spinner内的数字输入框列数 - * @param numberFieldColumns 输入框列数 + * + * @param numberFieldColumns 输入框列数 */ public void setNumberFieldColumns(int numberFieldColumns) { textField.setColumns(numberFieldColumns); @@ -210,7 +242,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver @Override public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); - dim.height = SIZE; + dim.height = FineUIUtils.getAndScaleInt("Input.height", defaultButtonSize); return dim; } @@ -243,77 +275,50 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver } } - private class ButtionUI extends UIButtonUI { - private boolean isNormalPaint = true; - - @Override - protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) { - if (isPressed(b) && b.isPressedPainted()) { - isNormalPaint = false; - Color pressColor = UIConstants.COMBOBOX_BTN_PRESS; - GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), pressColor); - } else if (isRollOver(b)) { - isNormalPaint = false; - Color hoverColor = UIConstants.COMBOBOX_BTN_ROLLOVER; - GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), hoverColor); - } else if (b.isNormalPainted()) { - isNormalPaint = true; - GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted()); - } - } - - @Override - protected void paintModelIcon(ButtonModel model, Icon icon, Graphics g, JComponent c) { - if (isNormalPaint) { - g.setColor(UIConstants.COMBOBOX_BTN_NORMAL); - g.fillRect(0, 0, c.getWidth(), c.getHeight()); - } - super.paintModelIcon(model, icon, g, c); - } + @Override + public boolean isHovered() { + return hover; } private void initComponents() { textField = initNumberField(); textField.setMaxValue(maxValue); textField.setMinValue(minValue); - setValue(value); - preButton = new UIButton(UIConstants.ARROW_UP_ICON) { - public boolean shouldResponseChangeListener() { - return false; - } - - @Override - public ButtonUI getUI() { - return new ButtionUI(); - } - }; - preButton.setRoundBorder(true, Constants.LEFT); - nextButton = new UIButton(UIConstants.ARROW_DOWN_ICON) { - public boolean shouldResponseChangeListener() { - return false; - } + Insets insets = FineUIUtils.getAndScaleUIInsets("InputTextField.borderInsets", defaultInsets); + textField.setBorder(BorderFactory.createEmptyBorder(insets.top, insets.left, insets.bottom, insets.right)); + textField.setOpaque(false); - @Override - public ButtonUI getUI() { - return new ButtionUI(); - } - }; - nextButton.setRoundBorder(true, Constants.LEFT); + setValue(value); + preButton = createArrowButton(new LazyIcon("up_arrow", ICON_WIDTH)); + nextButton = createArrowButton(new LazyIcon("down_arrow", ICON_WIDTH)); setLayout(new BorderLayout()); add(textField, BorderLayout.CENTER); JPanel arrowPane = new JPanel(); - arrowPane.setPreferredSize(new Dimension(LEN, SIZE)); arrowPane.setLayout(new GridLayout(2, 1)); - preButton.setBounds(0, 1, WIDTH, HEIGHT); - nextButton.setBounds(0, HEIGHT, WIDTH, HEIGHT); arrowPane.add(preButton); arrowPane.add(nextButton); + arrowPane.setOpaque(false); + + int buttonWidth = FineUIUtils.getAndScaleInt("InputButton.width", defaultButtonSize); + int buttonHeight = FineUIUtils.getAndScaleInt("InputButton.height", defaultButtonSize); + arrowPane.setPreferredSize(new Dimension(buttonWidth, buttonHeight)); add(arrowPane, BorderLayout.EAST); componentInitListeners(); } + private UIButton createArrowButton(Icon icon) { + UIButton arrowButton = new UIButton(icon) { + public boolean shouldResponseChangeListener() { + return false; + } + }; + setStyle(arrowButton, STYLE_TEXT); + return arrowButton; + } + /** * 设置最大值 + * * @param maxValue 最大值 */ public void setMaxValue(double maxValue) { @@ -356,7 +361,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver initTextFiledListeners(); } - protected void initTextFiledListeners(){ + protected void initTextFiledListeners() { textField.getDocument().removeDocumentListener(docListener); textField.getDocument().addDocumentListener(docListener); textField.addFocusListener(new FocusAdapter() { @@ -377,11 +382,12 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver protected UINumberField initNumberField() { int columns = this.numberFieldColumns == 0 ? DEFAULT_NUMBERFIELD_COLUMNS : this.numberFieldColumns; - return new UINumberField(columns) { + UINumberField numberField = new UINumberField(columns) { public boolean shouldResponseChangeListener() { return false; } }; + return numberField; } private DocumentListener docListener = new DocumentListener() { diff --git a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinnerUI.java b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinnerUI.java index d6d91e991d..d1abbf39b6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinnerUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinnerUI.java @@ -6,7 +6,6 @@ package com.fr.design.gui.ispinner; import com.fr.design.constants.UIConstants; -import com.fr.design.gui.ibutton.SpecialUIButton; import com.fr.design.gui.ibutton.UIButton; import javax.swing.*; diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/FineUITable.java b/designer-base/src/main/java/com/fr/design/gui/itable/FineUITable.java new file mode 100644 index 0000000000..2bd7bfd051 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/itable/FineUITable.java @@ -0,0 +1,38 @@ +package com.fr.design.gui.itable; + +import javax.swing.JTable; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.JTableHeader; +import javax.swing.table.TableColumnModel; + +/** + * 应用 TableHeaderUI 样式的 table + * @author lemon + * @since + * Created on + */ +public class FineUITable extends JTable { + + + public FineUITable(AbstractTableModel tableModel){ + super(tableModel); + setTableHeader(new FineUITableHeader(tableHeader.getColumnModel())); + } + + /** + * tableHeader + */ + public static class FineUITableHeader extends JTableHeader { + private static final String UI_CLASS_ID = "TableHeaderUI"; + + + public FineUITableHeader(TableColumnModel columnModel){ + super(columnModel); + } + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/SortableJTable.java b/designer-base/src/main/java/com/fr/design/gui/itable/SortableJTable.java index 71ffa8832e..e071f15008 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itable/SortableJTable.java +++ b/designer-base/src/main/java/com/fr/design/gui/itable/SortableJTable.java @@ -1,10 +1,16 @@ package com.fr.design.gui.itable; -import javax.swing.JTable; +/** + * SortableJTable + * @author lemon + * @since + * Created on + */ +public class SortableJTable extends FineUITable { -public class SortableJTable extends JTable{ public SortableJTable(TableSorter tableModel){ super(tableModel); tableModel.setTableHeader(getTableHeader()); + setShowGrid(true); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/TableSorter.java b/designer-base/src/main/java/com/fr/design/gui/itable/TableSorter.java index 3a11edfbf6..817ac54520 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itable/TableSorter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itable/TableSorter.java @@ -14,10 +14,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.swing.Icon; - import com.fr.common.inputevent.InputEventBaseOnOS; import com.fr.design.gui.ilable.UILabel; + +import javax.swing.Icon; import javax.swing.JTable; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/UITable.java b/designer-base/src/main/java/com/fr/design/gui/itable/UITable.java index e5dcd7fd14..5515736573 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itable/UITable.java +++ b/designer-base/src/main/java/com/fr/design/gui/itable/UITable.java @@ -1,17 +1,13 @@ package com.fr.design.gui.itable; -import java.awt.*; -import java.awt.event.AWTEventListener; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.event.UIObserver; +import com.fr.design.event.UIObserverListener; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itextfield.UITextField; +import org.jetbrains.annotations.NotNull; -import javax.swing.BorderFactory; import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; @@ -20,46 +16,55 @@ import javax.swing.plaf.TableUI; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; +import java.awt.AWTEvent; +import java.awt.Component; +import java.awt.Container; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Toolkit; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.MouseEvent; +import java.util.List; -import com.fr.design.constants.UIConstants; -import com.fr.design.event.UIObserver; -import com.fr.design.event.UIObserverListener; -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.utils.gui.GUICoreUtils; +import static com.fine.theme.utils.FineUIScale.scale; public class UITable extends JTable implements UIObserver { private static final int OFF_LEFT = 10; - private static final int DEFAULT_ROW_HEIGHT =20; + private static final int STEP = 2; + private static final int DEFAULT_ROW_HEIGHT = 24; private UIObserverListener uiObserverListener; - UITableEditor editor ; + UITableEditor editor; private boolean shouldResponseAwt; private boolean isEditingStopped; /** - * 在没有任何数据的时候，使用此构造函数，然后通过populate更新数据 - * - * @param columnSize 列表的列数 - */ - public UITable(int columnSize) { - - super(new UITableDataModel(columnSize)); - initComponents(); + * 在没有任何数据的时候，使用此构造函数，然后通过populate更新数据 + * + * @param columnSize 列表的列数 + */ + public UITable(int columnSize) { + + super(new UITableDataModel(columnSize)); + initComponents(); iniListener(); shouldResponseAwt = false; - // kunsnat: 屏蔽: 对于下拉框, 无法等待选择结果之后在stop.. -// Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK); - } + } - public UITable (int columnSize, boolean needAWTEventListener) { + public UITable(int columnSize, boolean needAWTEventListener) { this(columnSize); shouldResponseAwt = needAWTEventListener; isEditingStopped = true; if (needAWTEventListener) { - Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK); + Toolkit.getDefaultToolkit().addAWTEventListener(event -> { + if (!UITable.this.isShowing()) { + return; + } + doSomeInAll(event); + }, AWTEvent.MOUSE_EVENT_MASK); this.addFocusListener(new FocusAdapter() { public void focusGained(FocusEvent e) { isEditingStopped = false; @@ -68,319 +73,311 @@ public class UITable extends JTable implements UIObserver { } } - /** - * values不允许为空！ - * - * @param values 一个列表，里面装有字符串数组，每个数组代表一行内容 - */ - public UITable(List values) { - super(new UITableDataModel(values)); - initComponents(); + /** + * values不允许为空！ + * + * @param values 一个列表，里面装有字符串数组，每个数组代表一行内容 + */ + public UITable(List values) { + super(new UITableDataModel(values)); + initComponents(); iniListener(); - } + } + + public UITable() { + + } + + /** + * 传入列表数据 + * + * @param values 数据 + */ + public void populateBean(List values) { + getTableDataModel().populateBean(values); + } + + + private void doSomeInAll(AWTEvent event) { + Rectangle bounds = new Rectangle(getLocationOnScreen().x, getLocationOnScreen().y, getWidth(), getHeight()); + if (event instanceof MouseEvent) { + MouseEvent mv = (MouseEvent) event; + if (mv.getClickCount() > 0) { + Point point = new Point((int) (mv.getLocationOnScreen().getX()) - 2 * scale(OFF_LEFT), (int) mv.getLocationOnScreen().getY()); + // 判断鼠标点击是否在边界内 + if (!bounds.contains(point) && shouldResponseAwt) { + if (!isEditingStopped) { + this.editor.stopCellEditing(); + isEditingStopped = true; + } + } + } + } + } + + /** + * 获取模型中数据 + * + * @return 数据 + */ + public List updateBean() { + return getTableDataModel().updateBean(); + } + + /** + * 在table底部增加一空行 + */ + public void addBlankLine() { + getTableDataModel().addBlankLine(); + } + + /** + * 在table底部增加一行内容 + * + * @param line 该行的内容 + */ + public void addLine(Object[] line) { + getTableDataModel().addLine(line); + } + + /** + * @param rowIndex + * @return 某一行的内容 + */ + public Object[] getLine(int rowIndex) { + return getTableDataModel().getLine(rowIndex); + } + + /** + * 删除某行内容 + * + * @param rowIndex 行号 + */ + public void removeLine(int rowIndex) { + getTableDataModel().removeLine(rowIndex); + } + + /** + * 对某一行拖动时进行排序 + * + * @param rowIndex 行号 + * @param positive 鼠标移动的距离 + */ + public void dragSort(int rowIndex, boolean positive) { + ((UITableDataModel) dataModel).dragSort(rowIndex, positive); + } + + + /** + * 格子是否可编辑，可置顶某一列column不可编辑 + * + * @param row 行号 + * @param column 列号 + * @return 是否可编辑 + */ + public boolean isCellEditable(int row, int column) { + return true; + } + + /** + * 清空数据 + */ + public void clear() { + getTableDataModel().clear(); + } - public UITable() { + private UITableDataModel getTableDataModel() { + return (UITableDataModel) dataModel; + } - } + /** + * @param value 该行列的值(字符串) + * @param row + * @param column + * @return 列表中默认显示的东西，如果有很多内容，可以装载一个JPanel里再嵌进来 + */ + protected JComponent getRenderCompoment(Object value, int row, int column) { + UILabel text = new UILabel(); + if (value != null) { + text.setText(value.toString()); + } + return text; + } - public void populateBean(List values) { - getTableDataModel().populateBean(values); - } + protected void initComponents() { + setShowGrid(false); + setRowHeight(getRowHeight4Table()); + setDragEnabled(false); + editor = createTableEditor(); + editor.addCellEditorListener(new CellEditorListener() { + @Override + public void editingStopped(ChangeEvent e) { + tableCellEditingStopped(e); + } + + @Override + public void editingCanceled(ChangeEvent e) { + tableCellEditingCanceled(e); + } + + }); + setDefaultEditor(UITable.class, editor); + setDefaultRenderer(UITable.class, new UITableRender()); + setUI(getUI()); + + TableColumn deleteTableColumn = new TableColumn(getTableDataModel().getColumnCount()); + deleteTableColumn.setCellEditor(null); + deleteTableColumn.setCellRenderer(null); + deleteTableColumn.setMaxWidth(scale(24)); + getColumnModel().addColumn(deleteTableColumn); + } + /** + * 鼠标悬浮再某一行时触发的事件 + * + * @param index 行号 + */ + public void dealWithRollOver(int index) { + } - private AWTEventListener awt = new AWTEventListener() { - public void eventDispatched(AWTEvent event) { - if(!UITable.this.isShowing()){ + private void iniListener() { + if (shouldResponseChangeListener()) { + this.addChangeListener(e -> { + if (uiObserverListener == null) { return; } - doSomeInAll(event); - } - }; - - private void doSomeInAll(AWTEvent event) { - Rectangle bounds = new Rectangle(getLocationOnScreen().x, getLocationOnScreen().y, getWidth(), getHeight()); - if (event instanceof MouseEvent) { - MouseEvent mv = (MouseEvent) event; - if (mv.getClickCount() > 0) { - Point point = new Point((int) (mv.getLocationOnScreen().getX()) - 2 * OFF_LEFT, (int) mv.getLocationOnScreen().getY()); - // 判断鼠标点击是否在边界内 - if (!bounds.contains(point) && shouldResponseAwt) { - if (!isEditingStopped) { - this.editor.stopCellEditing(); - isEditingStopped = true; - } - } - } - } - } - - public List updateBean() { - return getTableDataModel().updateBean(); - } - - /** - * 在table底部增加一空行 - */ - public void addBlankLine() { - getTableDataModel().addBlankLine(); - } - - /** - * 在table底部增加一行内容 - * @param line 该行的内容 - */ - public void addLine(Object[] line) { - getTableDataModel().addLine(line); - } - - /** - * @param rowIndex - * @return 某一行的内容 - */ - public Object[] getLine(int rowIndex) { - return getTableDataModel().getLine(rowIndex); - } - - /** - * 删除某行内容 - * - * @param rowIndex 行号 - */ - public void removeLine(int rowIndex) { - getTableDataModel().removeLine(rowIndex); - } - - /** - * 对某一行拖动时进行排序 - * - * @param rowIndex 行号 - * @param positive 鼠标移动的距离 - */ - public void dragSort(int rowIndex, boolean positive) { - ((UITableDataModel) dataModel).dragSort(rowIndex, positive); - } - - - /** - *格子是否可编辑，可置顶某一列column不可编辑 - * @param row 行号 - * @param column 列号 - * @return 是否可编辑 - */ - public boolean isCellEditable(int row, int column) { - return true; - } - - /** - * 清空数据 - */ - public void clear() { - getTableDataModel().clear(); - } - - private UITableDataModel getTableDataModel() { - return (UITableDataModel) dataModel; - } - - /** - * @param value 该行列的值(字符串) - * @param row - * @param column - * @return 列表中默认显示的东西，如果有很多内容，可以装载一个JPanel里再嵌进来 - */ - protected JComponent getRenderCompoment(Object value, int row, int column) { - UILabel text = new UILabel(); - if (value != null) { - text.setText(value.toString()); - } - return text; - } - - protected void initComponents() { - setShowGrid(false); - setRowHeight(getRowHeight4Table()); - setDragEnabled(false); - editor = createTableEditor(); - editor.addCellEditorListener(new CellEditorListener() { - @Override - public void editingStopped(ChangeEvent e) { - tableCellEditingStopped(e); - } - - @Override - public void editingCanceled(ChangeEvent e) { - tableCellEditingCanceled(e); - } - - }); - - setBackground(UIConstants.NORMAL_BACKGROUND); - setDefaultEditor(UITable.class, editor); - setDefaultRenderer(UITable.class, new UITableRender()); - setUI(getUI()); - - TableColumn deleteTableColumn = new TableColumn(getTableDataModel().getColumnCount()); - deleteTableColumn.setCellEditor(null); - deleteTableColumn.setCellRenderer(null); - deleteTableColumn.setMaxWidth(20); - getColumnModel().addColumn(deleteTableColumn); - } - - /** - * 鼠标悬浮再某一行时触发的事件 - * @param index 行号 - */ - public void dealWithRollOver(int index){ - - } - - private void iniListener(){ - if(shouldResponseChangeListener()){ - this.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - if(uiObserverListener == null){ - return ; - } - uiObserverListener.doChange(); - } + uiObserverListener.doChange(); }); } } - protected int getRowHeight4Table() { - return DEFAULT_ROW_HEIGHT; - } + protected int getRowHeight4Table() { + return scale(DEFAULT_ROW_HEIGHT); + } - /** - *停止编辑事件 - * @param e 事件 - */ - public void tableCellEditingStopped(ChangeEvent e) { + /** + * 停止编辑事件 + * + * @param e 事件 + */ + public void tableCellEditingStopped(ChangeEvent e) { - } + } /** - *取消编辑事件 + * 取消编辑事件 + * * @param e 事件 */ - public void tableCellEditingCanceled(ChangeEvent e) { + public void tableCellEditingCanceled(ChangeEvent e) { - } - - /** - * 编辑器 - * @return 编辑器 - */ - public UITableEditor createTableEditor() { - return new UIDefaultTableCellEditor(new UITextField()); - } + } - @Override /** + * 编辑器 * + * @return 编辑器 + */ + public UITableEditor createTableEditor() { + return new UIDefaultTableCellEditor(new UITextField()); + } + + /** + * repaint 所有父类，避免滚动条没有跟随 添加/删除 事件响应 */ - public TableUI getUI() { - return new UITableUI(); - } + public void doParentRepaintEvent() { + Container parent = this.getParent(); + while (parent != null) { + parent.revalidate(); + parent.repaint(); + parent = parent.getParent(); + } + } - @Override + @Override /** * */ - public TableCellEditor getDefaultEditor(Class columnClass) { - return super.getDefaultEditor(UITable.class); - } + public TableUI getUI() { + return new UITableUI(); + } + + @Override + public TableCellEditor getDefaultEditor(Class columnClass) { + return super.getDefaultEditor(UITable.class); + } + + @Override + public TableCellRenderer getDefaultRenderer(Class columnClass) { + // 处理null的情况用于创建时未指定数据结构的情况 + if (columnClass == null) { + return createDefaultRenderer(); + } + return super.getDefaultRenderer(columnClass); + } + + private @NotNull TableCellRenderer createDefaultRenderer() { + Object renderer = defaultRenderersByColumnClass.get(UITable.class); + return renderer != null ? (TableCellRenderer) renderer : new UITableRender(); + } - @Override /** + * 给组件登记一个观察者监听事件 * + * @param listener 观察者监听事件 */ - public TableCellRenderer getDefaultRenderer(Class columnClass) { - return super.getDefaultRenderer(UITable.class); - } - - /** - * 给组件登记一个观察者监听事件 - * - * @param listener 观察者监听事件 - */ public void registerChangeListener(UIObserverListener listener) { uiObserverListener = listener; } - /** - * 组件是否需要响应添加的观察者事件 - * - * @return 如果需要响应观察者事件则返回true，否则返回false - */ + /** + * 组件是否需要响应添加的观察者事件 + * + * @return 如果需要响应观察者事件则返回true，否则返回false + */ public boolean shouldResponseChangeListener() { return true; } protected class UITableRender implements TableCellRenderer { - @Override - public Component getTableCellRendererComponent(JTable table, - Object value, boolean isSelected, boolean hasFocus, int row, - int column) { - JComponent comp = getRenderCompoment(value, row, column); - comp.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); - return comp; - } - } - - protected void fireTargetChanged() { - repaint(); - Object[] listeners = listenerList.getListenerList(); - - for (int i = listeners.length - 2; i >= 0; i -= 2) { - if (listeners[i] == ChangeListener.class) { - ((ChangeListener) listeners[i + 1]).stateChanged(new ChangeEvent(this)); - } - } - } - - /** - * 增加监听 - * @param l 监听 - */ - public void addChangeListener(ChangeListener l) { - this.listenerList.add(ChangeListener.class, l); - } + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, int row, + int column) { + JComponent comp = getRenderCompoment(value, row, column); + comp.setBorder(new ScaledEmptyBorder(6, 6, 6, 6)); + return comp; + } + } + + protected void fireTargetChanged() { + repaint(); + Object[] listeners = listenerList.getListenerList(); + + for (int i = listeners.length - STEP; i >= 0; i -= STEP) { + if (listeners[i] == ChangeListener.class) { + ((ChangeListener) listeners[i + 1]).stateChanged(new ChangeEvent(this)); + } + } + } /** - *移除监听 + * 增加监听 + * * @param l 监听 */ - public void removeChangeListener(ChangeListener l) { - this.listenerList.remove(ChangeListener.class, l); - } + public void addChangeListener(ChangeListener l) { + this.listenerList.add(ChangeListener.class, l); + } /** - *测试主函数 - * @param args 参数 + * 移除监听 + * + * @param l 监听 */ - public static void main(String... args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel) jf.getContentPane(); - content.setLayout(new BorderLayout()); - List data = new ArrayList(); - String[] a = {"1", "11"}; - String[] b = {"2", "22"}; - String[] c = {"3", "33"}; - String[] d = {"4", "44"}; - data.add(a); - data.add(b); - data.add(c); - data.add(d); - UITable pane = new UITable(2); - pane.populateBean(data); - content.add(pane, BorderLayout.CENTER); - GUICoreUtils.centerWindow(jf); - jf.setSize(400, 400); - jf.setVisible(true); - } -} \ No newline at end of file + public void removeChangeListener(ChangeListener l) { + this.listenerList.remove(ChangeListener.class, l); + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java index 93ce206299..9248f3fb9d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java @@ -6,9 +6,9 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.Stroke; import java.awt.event.MouseEvent; -import java.awt.image.BufferedImage; import javax.swing.CellRendererPane; +import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JTable; @@ -17,7 +17,8 @@ import javax.swing.plaf.basic.BasicTableUI; import javax.swing.table.TableCellEditor; import javax.swing.table.TableModel; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.constants.UIConstants; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.mainframe.DesignerContext; @@ -25,8 +26,10 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.stable.Constants; import com.fr.design.utils.gui.GUIPaintUtils; +import static com.fine.theme.utils.FineUIScale.scale; + public class UITableUI extends BasicTableUI { - private static BufferedImage closeIcon = BaseUtils.readImageWithCache("com/fr/design/images/toolbarbtn/close.png"); + private static final Icon CLOSE_ICON = new LazyIcon("remove"); protected boolean isReleased = true; protected int rollOverRowIndex = -1; protected int dragStartRowIndex = -1; @@ -35,7 +38,7 @@ public class UITableUI extends BasicTableUI { private int startColumn; private int startRow; private boolean draggingRow = false; - private static final int WIDTH_GAP = 20; + private static final int WIDTH_GAP = 24; private int startDragPoint; private int dyOffset; @@ -48,7 +51,7 @@ public class UITableUI extends BasicTableUI { public UITableUI(JComponent table) { super(); this.table = (JTable) table; - this.table.setRowHeight(20); + this.table.setRowHeight(scale(WIDTH_GAP)); } @Override @@ -95,13 +98,14 @@ public class UITableUI extends BasicTableUI { if(!isDeletable()){ return; } - g2d.drawImage(closeIcon, table.getWidth() - 20, rollOverRowIndex * table.getRowHeight() + 1, closeIcon.getWidth(), closeIcon.getHeight(), table); + CLOSE_ICON.paintIcon(table, g2d, table.getWidth() - scale(WIDTH_GAP), rollOverRowIndex * table.getRowHeight() + 1); } private void paintRolloverBackground(Graphics2D g2d) { if (rollOverRowIndex != -1) { - g2d.setColor(UIConstants.FLESH_BLUE); - GUIPaintUtils.fillPaint(g2d, 1, rollOverRowIndex * table.getRowHeight(), table.getWidth() - 2, table.getRowHeight(), true, Constants.NULL, UIConstants.FLESH_BLUE, UIConstants.LARGEARC); + Color selectionColor = FlatUIUtils.getUIColor("List.selectionBackground", UIConstants.FLESH_BLUE); + g2d.setColor(selectionColor); + GUIPaintUtils.fillPaint(g2d, 1, rollOverRowIndex * table.getRowHeight(), table.getWidth() - 2, table.getRowHeight(), true, Constants.NULL, selectionColor, 0); } } @@ -124,7 +128,7 @@ public class UITableUI extends BasicTableUI { @Override public void mousePressed(MouseEvent e) { super.mousePressed(e); - if (e.getX() >= table.getWidth() - WIDTH_GAP) { + if (e.getX() >= table.getWidth() - scale(WIDTH_GAP)) { if (table.isEditing()) { table.getCellEditor(startRow, startColumn).stopCellEditing(); } @@ -139,6 +143,7 @@ public class UITableUI extends BasicTableUI { ((UITable) table).removeLine(table.rowAtPoint(e.getPoint())); ((UITable) table).fireTargetChanged(); ((UITable) table).getParent().doLayout(); + ((UITable) table).doParentRepaintEvent(); return; } } diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java index 1b1471d40e..72480a8121 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java @@ -1,5 +1,7 @@ package com.fr.design.gui.itableeditorpane; +import com.fine.theme.light.ui.FineTableHeaderUI; +import com.fine.theme.utils.FineUIStyle; import com.fr.base.Parameter; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; @@ -12,7 +14,6 @@ import com.fr.stable.StringUtils; import javax.swing.*; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import java.awt.*; import java.awt.event.ActionEvent; @@ -229,24 +230,24 @@ public class ParameterTableModel extends UITableModelAdapter } - private class ParameterValueRenderer extends DefaultTableCellRenderer { + private class ParameterValueRenderer extends FineTableHeaderUI.TableRenderer { private static final long serialVersionUID = 1L; private ValueEditorPane editor; private UILabel disableLable; - public ParameterValueRenderer(int paraUseType) { this(ValueEditorPaneFactory.createVallueEditorPaneWithUseType(paraUseType)); } public ParameterValueRenderer(ValueEditorPane valueEditorPane) { disableLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Paramete_Name")); - disableLable.setForeground(Color.pink); - disableLable.setHorizontalAlignment(SwingConstants.CENTER); - + FineUIStyle.setStyle(disableLable, FineUIStyle.LABEL_WARNING_TIP); + disableLable.setOpaque(true); + disableLable.setHorizontalAlignment(SwingConstants.LEFT); editor = valueEditorPane; } public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + JComponent component = ((JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column)); if (table.isCellEditable(row, column)) { if (value == null) { editor.populate(""); @@ -255,6 +256,8 @@ public class ParameterTableModel extends UITableModelAdapter } return editor; } else { + disableLable.setBorder(component.getBorder()); + disableLable.setBackground(component.getBackground()); return disableLable; } } diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UIArrayTableModel.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UIArrayTableModel.java index b42358dfbc..15d166bcd2 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UIArrayTableModel.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UIArrayTableModel.java @@ -3,6 +3,7 @@ package com.fr.design.gui.itableeditorpane; import java.awt.event.ActionEvent; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class UIArrayTableModel extends UITableModelAdapter implements ActionStyle { @@ -67,7 +68,9 @@ public class UIArrayTableModel extends UITableModelAdapter implements @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - addRow(new Object[getColumnCount()]); + Object[] values = new Object[getColumnCount()]; + Arrays.fill(values, "="); + addRow(values); fireTableDataChanged(); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java index aca38b28d2..ddde924b61 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java @@ -1,17 +1,21 @@ package com.fr.design.gui.itableeditorpane; -import com.fr.design.border.UIRoundedBorder; -import com.fr.design.constants.UIConstants; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.icontainer.UITableScrollPane; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itable.FineUITable; import com.fr.design.layout.FRGUIPaneFactory; import javax.swing.JPanel; -import javax.swing.JTable; +import javax.swing.JScrollPane; import javax.swing.event.TableModelListener; import java.awt.BorderLayout; +import java.awt.Dimension; import java.awt.GridLayout; import java.awt.Insets; import java.util.List; @@ -27,17 +31,24 @@ public class UITableEditorPane extends BasicPane { * */ private static final long serialVersionUID = 6855793816972735815L; - private JTable editTable; + protected FineUITable editTable; // 放置action 的按钮. - private UITableModelAdapter tableModel; + protected UITableModelAdapter tableModel; private String leftLabelName; private JPanel buttonPane; + protected JScrollPane scrollPane; + protected JPanel verticalScrollBar; public UITableEditorPane(UITableModelAdapter model) { this.tableModel = model; this.initComponent(model.createAction()); } + public UITableEditorPane(UITableModelAdapter model, JPanel panel) { + this.tableModel = model; + this.initComponent(model.createAction(), panel); + } + public UITableEditorPane(UITableModelAdapter model, String s) { leftLabelName = s; this.tableModel = model; @@ -45,24 +56,28 @@ public class UITableEditorPane extends BasicPane { } protected void initComponent(UITableEditAction[] action) { + this.initComponent(action, null); + + } + + protected void initComponent(UITableEditAction[] action, JPanel content) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel pane = new JPanel(new BorderLayout(4, 4)); this.add(pane, BorderLayout.CENTER); UILabel l = new UILabel(leftLabelName); editTable = tableModel.createTable(); - editTable.getTableHeader().setBackground(UIConstants.DEFAULT_BG_RULER); - UIScrollPane scrollPane = new UIScrollPane(editTable); - scrollPane.setBorder(new UIRoundedBorder(UIConstants.TITLED_BORDER_COLOR, 1, UIConstants.ARC)); - pane.add(scrollPane, BorderLayout.CENTER); + UITableScrollPane scrollPane = new UITableScrollPane(editTable); + scrollPane.setBorder(new FineRoundBorder()); initbuttonPane(action); JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); controlPane.add(buttonPane, BorderLayout.EAST); - controlPane.add(l, BorderLayout.WEST); - pane.add(controlPane, BorderLayout.NORTH); + controlPane.add(content == null ? l : content, BorderLayout.WEST); - } + pane.add(Layouts.column(LayoutConstants.HGAP_LARGE, Layouts.cell(controlPane), Layouts.cell(scrollPane).weight(1)).getComponent()); + this.editTable.setRowHeight(FineUIScale.scale(24)); + } public UITableModelAdapter getTableModel() { return tableModel; @@ -72,7 +87,7 @@ public class UITableEditorPane extends BasicPane { buttonPane = new JPanel(); if (action != null) { - buttonPane.setLayout(new GridLayout(1, action.length, 3, 3)); + buttonPane.setLayout(new GridLayout(1, action.length, FineUIScale.scale(2), 0)); for (int i = 0; i < action.length; i++) { final UIButton newButton = new UIButton(action[i]); newButton.set4ToolbarButton(); @@ -80,9 +95,9 @@ public class UITableEditorPane extends BasicPane { newButton.setText(""); newButton.setName(action[i].getName()); newButton.setToolTipText(action[i].getName()); - newButton.setBorder(null); newButton.setMargin(null); newButton.setOpaque(false); + newButton.setPreferredSize(FineUIScale.scale(new Dimension(24, 24))); buttonPane.add(newButton); } } @@ -148,11 +163,14 @@ public class UITableEditorPane extends BasicPane { return buttonPane; } - public JTable getEditTable() { + /** + * @return jTable + */ + public FineUITable getEditTable() { return editTable; } - public void setEditTable(JTable editTable) { + public void setEditTable(FineUITable editTable) { this.editTable = editTable; } diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index 8b046f3d08..69d58e6c55 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -1,13 +1,13 @@ package com.fr.design.gui.itableeditorpane; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.dialog.FineJOptionPane; +import com.fr.design.gui.itable.FineUITable; import com.fr.design.mainframe.DesignerContext; import com.fr.log.FineLoggerFactory; import org.jetbrains.annotations.Nullable; import javax.swing.JOptionPane; -import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableCellEditor; @@ -30,7 +30,7 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen * */ private static final long serialVersionUID = 3633792011995186187L; - protected JTable table; + protected FineUITable table; private Class[] classes; private String[] columnNames; @@ -40,7 +40,7 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen protected UITableModelAdapter(String[] columnNames) { this.columnNames = columnNames; - table = new JTable(this); + table = new FineUITable(this); table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); // TableRowSorter rowSorter = new TableRowSorter(this); // table.setRowSorter(rowSorter); @@ -50,7 +50,7 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen * 创建表 * @return 表 */ - public JTable createTable() { + public FineUITable createTable() { return table; } @@ -198,7 +198,7 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen protected abstract class AddTableRowAction extends UITableEditAction { public AddTableRowAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert")); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); + this.setSmallIcon(new LazyIcon("add")); } @Override @@ -215,7 +215,7 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen public EditAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png")); + this.setSmallIcon(new LazyIcon("edit")); } @Override @@ -239,13 +239,13 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen public DeleteAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); this.setDeleteTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?"); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); + this.setSmallIcon(new LazyIcon("remove")); } public DeleteAction(Component component){ this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); this.setDeleteTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?"); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); + this.setSmallIcon(new LazyIcon("remove")); this.component = component; } @@ -309,7 +309,7 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen protected class MoveUpAction extends UITableEditAction { public MoveUpAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png")); + this.setSmallIcon(new LazyIcon("move_up")); } @Override @@ -333,7 +333,7 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen public MoveDownAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png")); + this.setSmallIcon(new LazyIcon("move_down")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/itextarea/UITextArea.java b/designer-base/src/main/java/com/fr/design/gui/itextarea/UITextArea.java index 5f788e0621..c39b9f1ea0 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itextarea/UITextArea.java +++ b/designer-base/src/main/java/com/fr/design/gui/itextarea/UITextArea.java @@ -1,18 +1,31 @@ package com.fr.design.gui.itextarea; +import com.fine.theme.utils.FineUIScale; import com.fr.common.inputevent.InputEventBaseOnOS; +import com.fr.design.event.HoverAware; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; -import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.stable.Constants; -import javax.swing.*; +import javax.swing.JTextArea; +import javax.swing.UIManager; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import java.awt.*; - -public class UITextArea extends JTextArea implements UIObserver { +import java.awt.Dimension; +import java.awt.EventQueue; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +/** + * 文本域 + * + * @author anonymous + * @Created on 2016 + * @since 11.0 + */ +public class UITextArea extends JTextArea implements UIObserver, HoverAware { private UIObserverListener uiObserverListener; + private boolean hover; + private Dimension preferredSize; public UITextArea(int i, int j) { super(i, j); @@ -20,11 +33,6 @@ public class UITextArea extends JTextArea implements UIObserver { initComponents(); } - @Override - public Insets getInsets() { - return new Insets(5, 5, 5, 5); - } - public UITextArea() { super(); InputEventBaseOnOS.addBasicEditInputMap(this); @@ -73,6 +81,20 @@ public class UITextArea extends JTextArea implements UIObserver { }); } }); + + this.addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent e) { + hover = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + hover = false; + repaint(); + } + }); } } @@ -83,32 +105,6 @@ public class UITextArea extends JTextArea implements UIObserver { } @Override - /** - * - */ - public UITextAreaUI getUI() { - return (UITextAreaUI) ui; - } - - @Override - /** - * - */ - public void updateUI() { - this.setUI(new UITextAreaUI(this)); - } - - @Override - protected void paintBorder(Graphics g) { - if (getBorder() != null) { - getUI().paintBorder((Graphics2D) g, getWidth(), getHeight(), true, Constants.NULL); - } - } - - @Override - /** - * - */ public void registerChangeListener(UIObserverListener listener) { uiObserverListener = listener; } @@ -120,18 +116,18 @@ public class UITextArea extends JTextArea implements UIObserver { return true; } - /** - * @param args - */ - public static void main(String... args) { -// JFrame jf = new JFrame("test"); -// jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); -// JPanel content = (JPanel) jf.getContentPane(); -// content.setLayout(new BorderLayout()); -// UITextArea bb = new UITextArea("123455weoijweio reiwj kewl jfejkfljds kl jfldk jfk jdskfjkdsfklj dkl jfsdjf"); -// content.add(bb, BorderLayout.CENTER); -// GUICoreUtils.centerWindow(jf); -// jf.setSize(400, 400); -// jf.setVisible(true); + @Override + public boolean isHovered() { + return hover; + } + + @Override + public Dimension getPreferredSize() { + Dimension size = super.getPreferredSize(); + int height = FineUIScale.scale(UIManager.getInt("TextArea.height")); + if (size.height < height) { + return new Dimension(size.width, height); + } + return size; } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberField.java b/designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberField.java index 0d1287d8c0..115d471261 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberField.java +++ b/designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberField.java @@ -4,10 +4,10 @@ import com.fr.base.Utils; import com.fr.general.ComparatorUtils; import com.fr.stable.CoreConstants; import com.fr.stable.StringUtils; + import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; import javax.swing.text.PlainDocument; -import java.awt.Dimension; import java.awt.Toolkit; /** @@ -151,11 +151,6 @@ public class UINumberField extends UITextField { this.isContentChanged = isContentChanged; } - @Override - public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, 20); - } - class NumberDocument extends PlainDocument { public boolean checkString(int offset, String s, String str) { diff --git a/designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java b/designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java index 10edf9fe00..61f1b6b62c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java +++ b/designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java @@ -1,33 +1,36 @@ package com.fr.design.gui.itextfield; +import com.fine.theme.utils.FineUIUtils; import com.fr.common.inputevent.InputEventBaseOnOS; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; +import com.fr.design.event.HoverAware; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.Constants; import com.fr.stable.StringUtils; -import javax.swing.JFrame; -import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.text.Document; import java.awt.Color; import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.LayoutManager; -import java.awt.RenderingHints; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import static com.formdev.flatlaf.FlatClientProperties.PLACEHOLDER_TEXT; /** + * 文本框 + * * @author Jerry + * @Created on 2016 + * @since xxx */ -public class UITextField extends JTextField implements UIObserver, GlobalNameObserver { +public class UITextField extends JTextField implements UIObserver, GlobalNameObserver, HoverAware { + private final int defaultHeight = 24; private boolean isBorderPainted = true; private boolean isRoundBorder = true; private int rectDirection = Constants.NULL; @@ -35,11 +38,12 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs private String textFieldName = StringUtils.EMPTY; private GlobalNameListener globalNameListener = null; private Dimension preferredSize = null; - private String placeholder = StringUtils.EMPTY; //有些情况下setText的时候不希望触发attributeChange，添加一个属性标识 private boolean isSetting = false; + private boolean hover = false; + public UITextField() { super(); init(); @@ -70,9 +74,28 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs */ public void init() { InputEventBaseOnOS.addBasicEditInputMap(this); + initCommonListeners(); initListener(); } + private void initCommonListeners() { + if (shouldResponseChangeListener()) { + this.addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent e) { + hover = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + hover = false; + repaint(); + } + }); + } + } + protected void initListener() { if (shouldResponseChangeListener()) { getDocument().addDocumentListener(new DocumentListener() { @@ -95,11 +118,11 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs } public String getPlaceholder() { - return placeholder; + return (String) this.getClientProperty(PLACEHOLDER_TEXT); } public void setPlaceholder(String placeholder) { - this.placeholder = placeholder; + this.putClientProperty(PLACEHOLDER_TEXT, placeholder); } @@ -111,10 +134,6 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs isSetting = setting; } - public void setPreferredSize(Dimension preferredSize) { - this.preferredSize = preferredSize; - } - public void setGlobalName(String name) { textFieldName = name; } @@ -131,59 +150,11 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs } } - @Override - public Insets getInsets() { - return new Insets(0, 4, 0, 4); - } - - @Override - public Dimension getPreferredSize() { - if (preferredSize == null) { - return new Dimension(super.getPreferredSize().width, 20); - } - return preferredSize; - } - - @Override - public UITextFieldUI getUI() { - return (UITextFieldUI) ui; - } - /** * 设置变化的背景颜色 */ public void setBackgroundUIColor(Color color) { - ((UITextFieldUI) this.ui).setBackgroundColor4NoGiveNumber(color); - } - - /** - * 更新UI - */ - public void updateUI() { - this.setUI(new UITextFieldUI(this)); - } - - @Override - protected void paintComponent(final Graphics pG) { - super.paintComponent(pG); - if (placeholder.length() == 0 || getText().length() > 0) { - return; - } - final Graphics2D g = (Graphics2D) pG; - g.setRenderingHint( - RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - g.setColor(getDisabledTextColor()); - g.drawString(placeholder, getInsets().left, pG.getFontMetrics() - .getMaxAscent() + getInsets().top + 1); - } - - @Override - protected void paintBorder(Graphics g) { - if (!isBorderPainted) { - return; - } - getUI().paintBorder((Graphics2D) g, getWidth(), getHeight(), isRoundBorder, rectDirection); +// ((UITextFieldUI) this.ui).setBackgroundColor4NoGiveNumber(color); } /** @@ -238,28 +209,17 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs return true; } - /** - * 主函数 - * - * @param args 参数 - */ - public static void main(String... args) { - LayoutManager layoutManager = null; - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel) jf.getContentPane(); - content.setLayout(layoutManager); - - UITextField bb = new UITextField(5); - bb.setBounds(20, 20, bb.getPreferredSize().width, bb.getPreferredSize().height); - content.add(bb); - GUICoreUtils.centerWindow(jf); - jf.setSize(400, 400); - jf.setVisible(true); - } - public void setBorderPainted(boolean isBorderPainted) { this.isBorderPainted = isBorderPainted; } + @Override + public boolean isHovered() { + return hover; + } + + @Override + public Dimension getPreferredSize() { + return new Dimension(super.getPreferredSize().width, FineUIUtils.getAndScaleInt("Input.height", defaultHeight)); + } } diff --git a/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java b/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java index 709fdece73..2328bd3c0c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java +++ b/designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java @@ -1,16 +1,18 @@ package com.fr.design.gui.itoolbar; -import com.fr.design.file.HistoryTemplateListCache; -import com.fr.design.mainframe.JTemplate; +import com.fine.theme.utils.FineUIScale; +import javax.swing.JToolBar; import java.awt.Component; +import java.awt.Insets; import java.awt.FlowLayout; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import javax.swing.JToolBar; public class UIToolbar extends JToolBar { + // 间距按规范设置为2px + int hgap = 2; public UIToolbar() { this(FlowLayout.LEFT); @@ -20,9 +22,9 @@ public class UIToolbar extends JToolBar { super(); setFloatable(false); setRollover(true); - setLayout(new FlowLayout(align, 4, 0)); - setUI(uiToolBarUI); + setLayout(new FlowLayout(align, FineUIScale.scale(hgap), 0)); setBorderPainted(false); + setMargin(new Insets(0, 0, 0, 0)); } public UIToolbar(int align) { diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java b/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java index a4d66c4384..af6dfc7ead 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java @@ -1,6 +1,5 @@ package com.fr.design.gui.itree; -import com.fr.base.BaseUtils; import com.fr.base.svg.IconUtils; import com.fr.design.utils.ThemeUtils; diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java index e06ac43033..00f740983a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java @@ -117,9 +117,6 @@ public class CheckBoxTree extends JTree { for (int i = 0, length = listeners.length; i < length; i++) { component.removeMouseListener(listeners[i]); } -// for (MouseListener listener : listeners) { -// component.removeMouseListener(listener); -// } for (int i = 0; i < listeners.length; i++) { MouseListener listener = listeners[i]; if (index == i) { @@ -357,9 +354,6 @@ public class CheckBoxTree extends JTree { TreePath tmpTreePath = treePaths[i]; toggleSelection(tmpTreePath); } -// for (TreePath treePath : treePaths) { -// toggleSelection(treePath); -// } } } diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTreeCellRenderer.java b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTreeCellRenderer.java index f205cca92f..3a92b44692 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTreeCellRenderer.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTreeCellRenderer.java @@ -6,12 +6,15 @@ package com.fr.design.gui.itree.checkboxtree; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import javax.swing.BorderFactory; import javax.swing.JComponent; +import javax.swing.JPanel; import javax.swing.JTree; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; @@ -54,12 +57,15 @@ public class CheckBoxTreeCellRenderer extends NullPanel implements TreeCellRende public CheckBoxTreeCellRenderer(TreeCellRenderer renderer) { if (noFocusBorder == null) { - noFocusBorder = new EmptyBorder(1, 1, 1, 1); + noFocusBorder = new ScaledEmptyBorder(1, 1, 1, 10); } _checkBox.setOpaque(false); setBorder(noFocusBorder); setLayout(FRGUIPaneFactory.createBorderLayout()); - add(_checkBox, BorderLayout.BEFORE_LINE_BEGINS); + add(_checkBox, BorderLayout.WEST); + JPanel gapPanel = new JPanel(); + gapPanel.setPreferredSize(FineUIScale.scale(new Dimension(4, 20))); + add(gapPanel, BorderLayout.CENTER); _actualTreeRenderer = renderer; } @@ -72,23 +78,11 @@ public class CheckBoxTreeCellRenderer extends NullPanel implements TreeCellRende } public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - _checkBox.setPreferredSize(new Dimension(PROTOTYPE.getPreferredSize().width, 0)); + _checkBox.setPreferredSize(FineUIScale.scale(new Dimension(PROTOTYPE.getPreferredSize().width, 0))); setComponentOrientation(tree.getComponentOrientation()); TreePath path = tree.getPathForRow(row); - if (path != null && tree instanceof CheckBoxTree) { - CheckBoxTreeSelectionModel selectionModel = ((CheckBoxTree) tree).getCheckBoxTreeSelectionModel(); - if (selectionModel != null) { - _checkBox.setEnabled(((CheckBoxTree) tree).isCheckBoxEnabled() && ((CheckBoxTree) tree).isCheckBoxEnabled(path)); - if (selectionModel.isPathSelected(path, selectionModel.isDigIn())) { - _checkBox.setState(TristateCheckBox.SELECTED); - } else if (selectionModel.isDigIn() && selectionModel.isPartiallySelected(path)) { - _checkBox.setState(TristateCheckBox.DO_NOT_CARE); - } else { - _checkBox.setState(TristateCheckBox.NOT_SELECTED); - } - } - } + handleCheckBox(tree, path); if (_actualTreeRenderer != null) { JComponent treeCellRendererComponent = (JComponent) _actualTreeRenderer.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); @@ -103,12 +97,37 @@ public class CheckBoxTreeCellRenderer extends NullPanel implements TreeCellRende remove((Component) this._actualTreeRenderer); - add(treeCellRendererComponent); + add(treeCellRendererComponent, BorderLayout.EAST); } return this; } + private void handleCheckBox(JTree tree, TreePath path) { + if (path == null || !(tree instanceof CheckBoxTree)) { + return; + } + + CheckBoxTree checkBoxTree = (CheckBoxTree) tree; + CheckBoxTreeSelectionModel selectionModel = checkBoxTree.getCheckBoxTreeSelectionModel(); + if (selectionModel == null) { + return; + } + + setCheckBoxState(path, selectionModel, checkBoxTree); + } + + private void setCheckBoxState(TreePath path, CheckBoxTreeSelectionModel selectionModel, CheckBoxTree checkBoxTree) { + _checkBox.setEnabled(checkBoxTree.isCheckBoxEnabled() && checkBoxTree.isCheckBoxEnabled(path)); + if (selectionModel.isPathSelected(path, selectionModel.isDigIn())) { + _checkBox.setState(TristateCheckBox.SELECTED); + } else if (selectionModel.isDigIn() && selectionModel.isPartiallySelected(path)) { + _checkBox.setState(TristateCheckBox.DO_NOT_CARE); + } else { + _checkBox.setState(TristateCheckBox.NOT_SELECTED); + } + } + public String getToolTipText(MouseEvent event) { if (_actualTreeRenderer instanceof JComponent) { Point p = event.getPoint(); diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/NullTristateCheckBox.java b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/NullTristateCheckBox.java index 2d742165c3..d46b125539 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/NullTristateCheckBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/NullTristateCheckBox.java @@ -62,6 +62,7 @@ public class NullTristateCheckBox extends TristateCheckBox { @Override public void updateUI() { + super.updateUI(); clearAttribute(); } diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java index b821b0731a..dcf062703b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java @@ -1,33 +1,17 @@ package com.fr.design.gui.itree.checkboxtree; -import com.fr.design.constants.UIConstants; +import com.fine.theme.icon.LazyIcon; import com.fr.design.event.StateChangeListener; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.design.utils.gui.GUIPaintUtils; -import com.fr.stable.Constants; -import sun.swing.SwingUtilities2; import javax.swing.AbstractAction; -import javax.swing.AbstractButton; import javax.swing.ActionMap; import javax.swing.ButtonGroup; import javax.swing.ButtonModel; import javax.swing.Icon; -import javax.swing.JComponent; import javax.swing.SwingUtilities; import javax.swing.event.ChangeListener; import javax.swing.plaf.ActionMapUIResource; -import javax.swing.plaf.basic.BasicHTML; -import javax.swing.plaf.metal.MetalCheckBoxUI; -import javax.swing.text.View; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.Rectangle; -import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemListener; @@ -54,6 +38,7 @@ import java.awt.event.MouseListener; * @author Dr. Heinz M. Kabutz */ public class TristateCheckBox extends UICheckBox { + /** * This is a type-safe enumerated type */ @@ -80,7 +65,6 @@ public class TristateCheckBox extends UICheckBox { public TristateCheckBox(String text, Icon icon, State initial) { super(text, icon); - setUI(new TristateCheckBoxUI()); // Add a listener for when the mouse is pressed super.addMouseListener(new MouseAdapter() { @Override @@ -106,19 +90,21 @@ public class TristateCheckBox extends UICheckBox { setState(initial); } + @Override + public Icon getSelectedIcon() { + return getState() == DO_NOT_CARE ? new LazyIcon("checkbox_part_checked") : super.getSelectedIcon(); + } + public TristateCheckBox(String text, State initial) { this(text, null, initial); - setUI(new TristateCheckBoxUI()); } public TristateCheckBox(String text) { this(text, DO_NOT_CARE); - setUI(new TristateCheckBoxUI()); } public TristateCheckBox() { this(null); - setUI(new TristateCheckBoxUI()); } /** @@ -359,84 +345,4 @@ public class TristateCheckBox extends UICheckBox { } } - private class TristateCheckBoxUI extends MetalCheckBoxUI { - @Override - public void paint(Graphics g, JComponent c) { - synchronized (this) { - AbstractButton b = (AbstractButton) c; - ButtonModel model = b.getModel(); - Dimension size = c.getSize(); - Font f = c.getFont(); - g.setFont(f); - FontMetrics fm = SwingUtilities2.getFontMetrics(c, g, f); - - Rectangle viewRect = new Rectangle(size); - Rectangle iconRect = new Rectangle(); - Rectangle textRect = new Rectangle(); - - Insets i = c.getInsets(); - viewRect.x += i.left; - viewRect.y += i.top; - viewRect.width -= (i.right + viewRect.x); - viewRect.height -= (i.bottom + viewRect.y); - - Icon altIcon = b.getIcon(); - - String text = SwingUtilities.layoutCompoundLabel( - c, fm, b.getText(), altIcon != null ? altIcon : getDefaultIcon(), - b.getVerticalAlignment(), b.getHorizontalAlignment(), - b.getVerticalTextPosition(), b.getHorizontalTextPosition(), - viewRect, iconRect, textRect, b.getIconTextGap()); - - // fill background - if (c.isOpaque()) { - g.setColor(b.getBackground()); - g.fillRect(0, 0, size.width, size.height); - } - - Graphics2D g2d = (Graphics2D) g; - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - if (SELECTED.equals(getState())) { - GUIPaintUtils.fillPaint(g2d, iconRect.x, iconRect.y, iconRect.width, iconRect.height, false, Constants.NULL, - model.isEnabled() ? UIConstants.CHECKBOX_HOVER_SELECTED : UIConstants.DISABLED_ICON_COLOR, 0); - } else if (model.isRollover() && !SELECTED.equals(getState())) { - g.setColor(UIConstants.CHECKBOX_HOVER_SELECTED); - g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC); - } else { - g.setColor(UIConstants.LINE_COLOR); - g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC); - } - - if (SELECTED.equals(getState())) { - UIConstants.YES_ICON.paintIcon(c, g, iconRect.x + 2, iconRect.y + 2); - } else if (DO_NOT_CARE.equals(getState())) { - g.setColor(UIConstants.CHECKBOX_HOVER_SELECTED); - g2d.fillRoundRect(iconRect.x + 2, iconRect.y + 2, iconRect.width - 4, iconRect.height - 4, UIConstants.ARC, UIConstants.ARC); - } - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - - // Draw the Text - drawLine(text, g, b, c, textRect, fm); - } - } - - private void drawLine(String text, Graphics g, AbstractButton b, JComponent c, Rectangle textRect, FontMetrics fm) { - if (text != null) { - View v = (View) c.getClientProperty(BasicHTML.propertyKey); - if (v != null) { - v.paint(g, textRect); - } else { - int mnemIndex = b.getDisplayedMnemonicIndex(); - if (model.isEnabled()) { - g.setColor(b.getForeground()); - } else { - g.setColor(getDisabledTextColor()); - } - SwingUtilities2.drawStringUnderlineCharAt(c, g, text, - mnemIndex, textRect.x, textRect.y + fm.getAscent()); - } - } - } - - } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ClassFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ClassFileTree.java index 96523cdc9f..e16798170b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ClassFileTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ClassFileTree.java @@ -2,6 +2,8 @@ package com.fr.design.gui.itree.filetree; import java.io.File; +import com.fine.theme.utils.FineUIStyle; +import com.fr.design.border.FineBorderFactory; import com.fr.file.filetree.FileNode; import com.fr.file.filetree.IOFileNodeFilter; import com.fr.stable.project.ProjectConstants; @@ -12,6 +14,8 @@ import com.fr.stable.project.ProjectConstants; public class ClassFileTree extends EnvFileTree { public ClassFileTree() { super(ProjectConstants.CLASSES_NAME, null, new IOFileNodeFilter(new String[]{"class"})); + FineUIStyle.setStyle(this, FineUIStyle.PURE_TREE); + setBorder(FineBorderFactory.createWrappedRoundBorder()); } /* diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java index 01b5beb68c..0d11eb491f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java @@ -1,7 +1,6 @@ package com.fr.design.gui.itree.filetree; import com.fr.base.FRContext; -import com.fr.design.constants.UIConstants; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.RefreshableJTree; import com.fr.design.i18n.Toolkit; @@ -14,17 +13,15 @@ import com.fr.stable.StableUtils; import com.fr.workspace.WorkContext; import com.fr.workspace.server.repository.template.TemplateRepository; -import java.util.HashMap; -import java.util.Map; -import javax.swing.BorderFactory; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import java.awt.Color; import java.awt.Component; import java.io.File; import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; /* * 文件结构树. @@ -62,7 +59,7 @@ public class EnvFileTree extends RefreshableJTree { // CellRenderer // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为 - DefaultTreeCellRenderer fileTreeCellRenderer = new DefaultTreeCellRenderer() { + DefaultTreeCellRenderer fileTreeCellRenderer = new FineTreeCellRender() { @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, @@ -78,7 +75,7 @@ public class EnvFileTree extends RefreshableJTree { if (lock != null && !lock.equals(node.getUserID())) { name = name + Toolkit.i18nText("Fine-Design_Basic_Template_Status_Locked", "(", ")"); } - this.setIcon(FileTreeIcon.getIcon(node)); + this.setIcon(FileTreeIcon.getIconWithExpandAttr(node, expanded)); } else { this.setIcon(FileTreeIcon.getFolderHalfImageIcon()); } @@ -87,10 +84,6 @@ public class EnvFileTree extends RefreshableJTree { this.setIcon(null); this.setText(PENDING.toString()); } - this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0)); - this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND); - this.setTextSelectionColor(Color.WHITE); - this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE); return this; } }; diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java index 194dfa82de..ca26e435aa 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java @@ -1,5 +1,6 @@ package com.fr.design.gui.itree.filetree; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.base.svg.IconUtils; import com.fr.design.ExtraDesignClassManager; @@ -23,36 +24,34 @@ public class FileTreeIcon { public static final String FILE_LOCKED_ICON_PATH = "/com/fr/design/images/gui/file_lock.png"; - public static final Icon BLANK_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/blank.gif"); - - public static final Icon FOLDER_IMAGE_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/folder.svg"); - public static final Icon FOLDER_HALF_IMAGE_ICON = - IconUtils.readIcon("/com/fr/design/standard/fileicon/folder_half_authority.svg"); + public static final Icon FOLDER_IMAGE_ICON = new LazyIcon("folder"); + public static final Icon FOLDER_OPEN_IMAGE_ICON = new LazyIcon("folder_open"); + public static final Icon MODERN_CPT_FILE_IMAGE_ICON = new LazyIcon("cpt_icon"); + public static final Icon MODERN_FRM_FILE_IMAGE_ICON = new LazyIcon("frm_icon"); + public static final Icon MODERN_FVS_FILE_IMAGE_ICON = new LazyIcon("fvs_icon"); public static final Icon FILE_IMAGE_ICON = UIManager.getIcon("FileView.fileIcon"); - public static final Icon JAVA_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/javaFile.gif"); - public static final Icon CLASS_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/classFile.gif"); - public static final Icon JSP_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/jspFile.gif"); - public static final Icon JS_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/jsFile.gif"); - public static final Icon XML_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/xmlFile.gif"); - public static final Icon HTML_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/htmlFile.gif"); - public static final Icon JAR_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/jarFile.gif"); - public static final Icon GIF_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/gifFile.gif"); - public static final Icon JPG_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/jpgFile.gif"); - public static final Icon BMP_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/bmpFile.gif"); - public static final Icon CPT_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/cptFile.png"); - public static final Icon FRM_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/frm.png"); - public static final Icon CHT_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/cht.png"); + public static final Icon JAVA_FILE_IMAGE_ICON = new LazyIcon("javaFile"); + public static final Icon CLASS_FILE_IMAGE_ICON = new LazyIcon("classFile"); + public static final Icon JSP_FILE_IMAGE_ICON = new LazyIcon("jspFile"); + public static final Icon JS_FILE_IMAGE_ICON = new LazyIcon("jsFile"); + public static final Icon XML_FILE_IMAGE_ICON = new LazyIcon("xmlFile"); + public static final Icon HTML_FILE_IMAGE_ICON = new LazyIcon("htmlFile"); + public static final Icon JAR_FILE_IMAGE_ICON = new LazyIcon("jarFile"); + public static final Icon GIF_FILE_IMAGE_ICON = new LazyIcon("gifFile"); + public static final Icon JPG_FILE_IMAGE_ICON = new LazyIcon("jpgFile"); + public static final Icon BMP_FILE_IMAGE_ICON = new LazyIcon("bmpFile"); + public static final Icon MODERN_CHT_FILE_IMAGE_ICON = new LazyIcon("chtFile"); + public static final Icon CPTX_ICON = new LazyIcon("cpt_icon"); - public static final Icon MODERN_CPT_FILE_IMAGE_ICON = - IconUtils.readIcon("/com/fr/design/standard/fileicon/cpt_icon.svg"); - public static final Icon MODERN_FRM_FILE_IMAGE_ICON = - IconUtils.readIcon("/com/fr/design/standard/fileicon/frm_icon.svg"); - public static final Icon MODERN_CHT_FILE_IMAGE_ICON = - IconUtils.readIcon("/com/fr/design/standard/fileicon/cht_icon.svg"); + public static final Icon CPT_FILE_LOCK_ICON = new LazyIcon("cpt_locked"); + public static final Icon FRM_FILE_LOCK_ICON = new LazyIcon("frm_locked"); + public static final Icon FVS_FILE_LOCK_ICON = new LazyIcon("fvs_locked"); - public static final Icon CPTX_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_icon.svg"); + // TODO: 以下Icon视觉暂未提供，需提供后替换 + public static final Icon BLANK_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/blank.gif"); + public static final Icon FOLDER_HALF_IMAGE_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/folder_half_authority.svg"); public static final Icon CPTX_LOCKED_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_icon_locked.svg"); public static final LockIcon FOLDER_LOCK_ICON = @@ -82,10 +81,6 @@ public class FileTreeIcon { new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/jpgFile.gif")); public static final LockIcon BMP_FILE_LOCK_ICON = new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/bmpFile.gif")); - public static final LockIcon CPT_FILE_LOCK_ICON = - new LockIcon(BaseUtils.readImage("/com/fr/base/images/oem/cptlocked.png")); - public static final LockIcon FRM_FILE_LOCK_ICON = - new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/frmlocked.png")); public static final LockIcon CHT_FILE_LOCK_ICON = new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/frmlocked.png")); /** @@ -116,6 +111,7 @@ public class FileTreeIcon { public final static int FRM_FILE = 12; //.form .frm public final static int CHT_FILE = 13; //.chart .cht public final static int CPTX_FILE = 14; //.cptx + public final static int FVS_FILE = 15; //.fvs public static Icon getIcon(File file) { return FileTreeIcon.getIcon(file, false); @@ -149,29 +145,69 @@ public class FileTreeIcon { return getIcon(node, showLock); } + /** + * 获取文件名对应的图标 + * + * @param filename 文件名 + * @return 文件的图标 + */ + public static Icon getIconByFileName(String filename) { + Icon icon = getExtraIcon(filename, false); + if (icon != null) { + return icon; + } + return getIcon(getFileType(filename), false); + } + + /** + * 获取文件节点对应的图标(含展开与否的属性) + * + * @param node 文件节点 + * @param isExpand 是否已扩展出子节点 + * + * @return 文件节点的图标 + */ + public static Icon getIconWithExpandAttr(FileNode node, boolean isExpand) { + boolean showLock = node.getLock() != null && !ComparatorUtils.equals(node.getUserID(), node.getLock()); + return getIconWithExpandAttr(node, showLock, isExpand); + } + public static Icon getIcon(FileNode node, boolean isShowLock) { + return getIconWithExpandAttr(node, isShowLock, false); + } + + private static Icon getIconWithExpandAttr(FileNode node, boolean isShowLock, boolean isExpand) { String path = StableUtils.pathJoin(WorkContext.getCurrent().getPath(), node.getEnvPath()); if (WorkContext.getCurrent().isLocal()) { File ff = new File(path); if (ff.exists()) { if (node.isDirectory()) { - return FileTreeIcon.FOLDER_IMAGE_ICON; + return getFolderIcon(isExpand); } return getLocalFileIcon(path, isShowLock); } } if (node.isDirectory()) { - return FileTreeIcon.FOLDER_IMAGE_ICON; + return getFolderIcon(isExpand); } else { return getRemoteFileIcon(node, isShowLock); } } + private static Icon getFolderIcon(boolean isExpand) { + return isExpand ? FileTreeIcon.FOLDER_OPEN_IMAGE_ICON : FileTreeIcon.FOLDER_IMAGE_ICON; + } + private static Icon getLocalFileIcon(String path, boolean isShowLock) { Icon icon = getExtraIcon(path, isShowLock); if (icon != null) { return icon; } + // 优先从本地已注册的文件图标读取；如读取到默认的文件图标(上锁及未上锁)，再从本地读取系统文件图标 + icon = FileTreeIcon.getIcon(FileTreeIcon.getFileType(path), isShowLock); + if (icon != FileTreeIcon.FILE_LOCK_ICON && icon != FileTreeIcon.FILE_IMAGE_ICON) { + return icon; + } return new LocalFileIcon(FileSystemView.getFileSystemView().getSystemIcon(new File(path)), isShowLock); } @@ -278,6 +314,12 @@ public class FileTreeIcon { } else { return FileTreeIcon.MODERN_CHT_FILE_IMAGE_ICON; } + } else if (fileType == FVS_FILE) { // fvs + if (isLocked) { + return FileTreeIcon.FVS_FILE_LOCK_ICON; + } else { + return FileTreeIcon.MODERN_FVS_FILE_IMAGE_ICON; + } } else { if (isLocked) { return FileTreeIcon.FILE_LOCK_ICON; @@ -334,6 +376,8 @@ public class FileTreeIcon { return FRM_FILE; } else if (fileName.endsWith(".cht") || fileName.endsWith(".chart")) { return CHT_FILE; + } else if (fileName.endsWith(".fvs")) { + return FVS_FILE; } else { return TEXT_FILE; } diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FineTreeCellRender.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FineTreeCellRender.java new file mode 100644 index 0000000000..4a1e333c09 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FineTreeCellRender.java @@ -0,0 +1,35 @@ +package com.fr.design.gui.itree.filetree; + +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; + +import javax.swing.JTree; +import javax.swing.BorderFactory; +import javax.swing.tree.DefaultTreeCellRenderer; +import java.awt.Component; +import java.awt.Insets; + +/** + * Tree子节点的渲染器 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/11/28 + */ +public class FineTreeCellRender extends DefaultTreeCellRenderer { + + private static final long serialVersionUID = 1L; + + private static final Insets DEFAULT_TREE_RENDER_MARGIN = new Insets(2, 0, 2, 0); + + @Override + public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { + super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); + Insets margins = FineUIUtils.getUIInsets("Tree.rendererMargins", DEFAULT_TREE_RENDER_MARGIN); + margins = FineUIScale.scale(margins); + this.setBorder(BorderFactory.createEmptyBorder(margins.top, margins.left, + margins.bottom, margins.right)); + this.setIconTextGap(FineUIUtils.getAndScaleInt("Tree.iconTextGap", "CheckBox.iconTextGap")); + return this; + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java index 3b37f4358b..00eb4db963 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java @@ -1,8 +1,8 @@ package com.fr.design.gui.itree.filetree; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.Toolkit; import com.fr.general.ComparatorUtils; -import com.fr.general.IOUtils; import com.fr.stable.ArrayUtils; import com.fr.stable.project.ProjectConstants; import org.jetbrains.annotations.Nullable; @@ -256,11 +256,7 @@ public class JFileTree extends AbstractFileTree { FileSystemView view = FileSystemView.getFileSystemView(); // File的全部路径. // 得到本地tree图标 - Icon tmpIcon = view.getSystemIcon(currentFile); - if (currentFile.isDirectory() && fBuf.length() > 0) { - tmpIcon = IOUtils.readIcon("/com/fr/design/images/gui/folder.png"); - } - this.setIcon(tmpIcon); + this.setIcon(getIcon(expanded, fBuf, currentFile, view, leaf)); this.setName(null); Font oldFont = this.getFont(); if (ComparatorUtils.equals(currentFile.getName(), ProjectConstants.WEBINF_NAME)) { @@ -280,9 +276,19 @@ public class JFileTree extends AbstractFileTree { treeNode = (DefaultMutableTreeNode) treeNode.getParent(); } return this; + + } + + private Icon getIcon(boolean expanded, StringBuilder fBuf, File currentFile, FileSystemView view, boolean leaf) { + boolean folderFile = !leaf || (currentFile.isDirectory() && fBuf.length() > 0); + if (folderFile) { + return expanded ? new LazyIcon("folder_open") : new LazyIcon("folder"); + } + return view.getSystemIcon(currentFile); } }; + /** * 对文件夹进行排序 先文件夹 然后各种类型文件 * diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java index 69e5a2c8ae..dbc7c54464 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java @@ -1,21 +1,24 @@ package com.fr.design.gui.itree.filetree; +import com.fine.theme.utils.FineUIUtils; +import com.fr.design.border.FineBorderFactory; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.itextarea.UITextArea; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.utils.DesignUtils; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.file.filetree.IOFileNodeFilter; import javax.swing.JPanel; import javax.swing.JScrollPane; import java.awt.BorderLayout; import java.awt.CardLayout; -import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; + public class ReportletPane extends BasicPane { private TemplateFileTree templateReportletTree; private JScrollPane t_panel; @@ -27,21 +30,18 @@ public class ReportletPane extends BasicPane { private JPanel cardPane; public ReportletPane() { - this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - // Description - UITextArea textPane = new UITextArea(); - this.add(textPane, BorderLayout.NORTH); - textPane.setEditable(false); - textPane.setLineWrap(true); - - textPane.setFont(DesignUtils.getDefaultGUIFont().applyStyle(Font.BOLD)); - textPane.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Schedule_The_Selected_File_Must_Be_End_With_Filter")); + this.setLayout(new BorderLayout()); + JPanel buttonPane = new JPanel(new BorderLayout()); + // Description + UILabel tipLabel = new UILabel(); + tipLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Schedule_The_Selected_File_Must_Be_End_With_Filter")); + tipLabel.setForeground(FineUIUtils.getUIColor("Label.tipColor", "Label.tipColor")); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(centerPane, BorderLayout.CENTER); switchButton = new UIButton("switch"); - centerPane.add(GUICoreUtils.createBorderPane(switchButton, BorderLayout.WEST), BorderLayout.NORTH); + buttonPane.add(row(10, cell(switchButton), cell(tipLabel)).getComponent()); switchButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent evt) { @@ -50,15 +50,16 @@ public class ReportletPane extends BasicPane { }); cardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); - centerPane.add(cardPane, BorderLayout.CENTER); cardPane.setLayout(card = new CardLayout()); templateReportletTree = new TemplateFileTree(); + templateReportletTree.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal")); + templateReportletTree.setBorder(FineBorderFactory.createWrappedRoundBorder()); IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form", ".cptx"}); templateReportletTree.setFileNodeFilter(filter); cardPane.add(t_panel = new JScrollPane(templateReportletTree), "TEMPLATE"); classReportletTree = new ClassFileTree(); cardPane.add(c_panel = new JScrollPane(classReportletTree), "CLASS"); - + centerPane.add(column(6, cell(buttonPane), cell(cardPane)).getComponent()); this.refreshEnv(); } diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java index 338038c36b..b649cf3c19 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java @@ -1,6 +1,5 @@ package com.fr.design.gui.itree.refreshabletree; -import com.fr.design.constants.UIConstants; import com.fr.design.gui.itooltip.UIToolTip; import com.fr.design.gui.itree.checkboxtree.CheckBoxTree; import com.fr.design.i18n.Toolkit; @@ -55,7 +54,6 @@ public abstract class RefreshableJTree extends CheckBoxTree { ExpandMutableTreeNode root = (ExpandMutableTreeNode) model.getRoot(); root.setExpanded(true); this.setRootVisible(false); - this.setBackground(UIConstants.TREE_BACKGROUND); this.addTreeExpansionListener(expansion); this.addTreeWillExpandListener(willExpand); } diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java index 691749fac6..9b1edf986f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java @@ -1,6 +1,7 @@ package com.fr.design.gui.itree.refreshabletree; import com.fr.data.impl.TreeAttr; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; @@ -8,11 +9,15 @@ import com.fr.design.layout.FRGUIPaneFactory; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.JPanel; +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + public class TreeRootPane extends BasicPane { @@ -30,38 +35,20 @@ public class TreeRootPane extends BasicPane { private final UICheckBox returnFullPathCheckBox; public TreeRootPane() { - this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); - - JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); - checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + this.setLayout(new BorderLayout()); checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not")); - checkTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - - checkTypePane.add(checkTypeCheckBox); - this.add(checkTypePane); - - JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); - checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async")); - loadTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - - loadTypePane.add(loadTypeCheckBox); - this.add(loadTypePane); - - JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); - checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only"))); - layerTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - - this.add(leafSelectPane); + layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")); + returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")); - JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); - checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path"))); - returnFullPathCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); addCheckBoxListener(); - this.add(returnFullPathPane); + this.add(column(LayoutConstants.VERTICAL_GAP, + cell(checkTypeCheckBox), + cell(loadTypeCheckBox), + cell(layerTypeCheckBox), + cell(returnFullPathCheckBox) + ).getComponent()); } diff --git a/designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java b/designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java index 0b814f284a..f1bc865c9f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java @@ -1,5 +1,6 @@ package com.fr.design.gui.style; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.designer.IntervalConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.UIPercentDragPane; @@ -51,7 +52,7 @@ public abstract class AbstractTranslucentBackgroundSpecialPane(hAlignmentIconArray, hAlignment); hAlignmentPane.setAllToolTips(new String[]{Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Left"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Right"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Distributed"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_DEFAULT")}); - hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - - Icon[][] vAlignmentIconArray = {{IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png")}, - {IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png")}, - {IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png")}}; + Icon[][] vAlignmentIconArray = {{new LazyIcon("v_top"), new LazyIcon("v_top").white()}, + {new LazyIcon("v_center"), new LazyIcon("v_center").white()}, + {new LazyIcon("v_bottom"), new LazyIcon("v_bottom").white()}}; Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM}; vAlignmentPane = new UIButtonGroup<>(vAlignmentIconArray, vAlignment); vAlignmentPane.setAllToolTips(new String[]{Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Top"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Bottom")}); @@ -146,8 +138,6 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO } private void initOtherComponent() { - hPaneContainer.add(hAlignmentPane); - vPaneContainer.add(vAlignmentPane); rotationPane = new UINumberDragPane(-ANGEL, ANGEL); leftIndentSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); @@ -157,24 +147,11 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO spaceAfterSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); lineSpaceSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); - rotationBarCC = new JPanel(new CardLayout()); - rotationBarCC.add(rotationPane, "show"); - rotationBarCC.add(new JPanel(), "hide"); - this.setLayout(new BorderLayout()); this.add(createPane(), BorderLayout.CENTER); - - textRotationComboBox.addItemListener(new ItemListener() { - - @Override - public void itemStateChanged(ItemEvent e) { - CardLayout cc = (CardLayout) rotationBarCC.getLayout(); - cc.show(rotationBarCC, textRotationComboBox.getSelectedIndex() == 0 ? "show" : "hide"); - } - }); } - private void initTextRotationCombox() { + private void initTextRotationComboBox() { ArrayList selectOption = new ArrayList<>(); selectOption.add(Toolkit.i18nText("Fine-Design_Basic_Custom_Angle")); VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class); @@ -198,101 +175,118 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO } private JPanel createPane() { - JPanel jp1 = new JPanel(new BorderLayout()); - basicPane = new JPanel(); - seniorPane = new JPanel(); - basicPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane()); - seniorPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane()); - - jp1.add(basicPane, BorderLayout.NORTH); - jp1.add(seniorPane, BorderLayout.CENTER); - - return jp1; + JPanel basicPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane()); + JPanel seniorPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane()); + return Layouts.column( + cell(basicPane), + fix(1).with(it -> it.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor")))), + cell(seniorPane) + ).getComponent(); } private JPanel basicPane() { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; UILabel horizontalLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal") + " ", SwingConstants.LEFT); + UILabel verticalLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical") + " ", SwingConstants.LEFT); UIComponentUtils.setLineWrap(horizontalLabel); - Component[][] components = new Component[][]{ - new Component[]{null, null}, - new Component[]{horizontalLabel, hPaneContainer}, - new Component[]{null, null}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical") + " ", SwingConstants.RIGHT), vPaneContainer}, - new Component[]{null, null} - }; - double[] rowSize = {p, p, p, p, p, p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); + UIComponentUtils.setLineWrap(verticalLabel); + return Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(horizontalLabel).weight(1.2), + cell(hAlignmentPane).weight(3)), + row( + cell(verticalLabel).weight(1.2), + cell(vAlignmentPane).weight(1.8), + flex(1.2)) + ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, LayoutConstants.VERTICAL_GAP, 0))).getComponent(); } private JPanel seniorPane() { - JPanel senPane = new JPanel(new BorderLayout()); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - Component[][] components = new Component[][]{ - new Component[]{null, null}, - new Component[]{new UILabel((Toolkit.i18nText("Fine-Design_Basic_Image_Layout")) + " ", SwingConstants.LEFT), imageLayoutComboBox}, - new Component[]{null, null}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style") + " ", SwingConstants.LEFT), textComboBox}, - new Component[]{null, null}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation") + " ", SwingConstants.LEFT), textRotationComboBox}, - new Component[]{null, rotationBarCC}, - new Component[]{null, null}, - }; - double[] rowSize = {p, p, p, p, p, p, p, p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; - JPanel tempPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); - senPane.add(tempPane, BorderLayout.NORTH); - senPane.add(seniorDownPane(), BorderLayout.CENTER); - return senPane; + return Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(seniorUpPane()), + cell(seniorMiddlePane()), + cell(seniorDownPane()) + ).getComponent(); } - private JPanel seniorDownPane() { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - leftIndentSpinner.setPreferredSize(SPINNER_DIMENSION); - rightIndentSpinner.setPreferredSize(SPINNER_DIMENSION); - spaceBeforeSpinner.setPreferredSize(SPINNER_DIMENSION); - spaceAfterSpinner.setPreferredSize(SPINNER_DIMENSION); - lineSpaceSpinner.setPreferredSize(SPINNER_DIMENSION); - - JPanel indentationPane = new JPanel(new BorderLayout()); - indentationPane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Indentation")), SwingConstants.LEFT)); - indentationPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP)); - JPanel partSpacingPane = new JPanel(new BorderLayout()); - partSpacingPane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Part_Spacing")), SwingConstants.LEFT)); - partSpacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP)); - JPanel spacingPane = new JPanel(new BorderLayout()); - spacingPane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing")), SwingConstants.LEFT)); - spacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP)); - - Component[][] components = new Component[][]{ - new Component[]{null, null, null}, - new Component[]{indentationPane, creatSpinnerPane(leftIndentSpinner), creatSpinnerPane(rightIndentSpinner)}, - new Component[]{null, new UILabel((Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER), new UILabel((Toolkit.i18nText("Fine-Design_Basic_Right")), SwingConstants.CENTER)}, - new Component[]{null, null, null}, - new Component[]{null, null, null}, - new Component[]{partSpacingPane, creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)}, - new Component[]{null, new UILabel((Toolkit.i18nText("Fine-Design_Basic_Front")), SwingConstants.CENTER), new UILabel((Toolkit.i18nText("Fine-Design_Basic_Behind")), SwingConstants.CENTER)}, - new Component[]{null, null, null}, - new Component[]{null, null, null}, - new Component[]{spacingPane, creatSpinnerPane(lineSpaceSpinner), null}, - }; - double[] rowSize = {p, p, p, p, p, p, p, p, p, p}; - double[] columnSize = {p, f, f}; - int[][] rowCount = {{1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}, {1, 1, 1}}; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, VERGAP); + private JPanel seniorUpPane() { + return Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Image_Layout")), SwingConstants.LEFT)).weight(1.2), + cell(imageLayoutComboBox).weight(3.0) + ), + row( + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style")), SwingConstants.LEFT)).weight(1.2), + cell(textComboBox).weight(3.0) + ) + ).getComponent(); } - private JPanel creatSpinnerPane(Component comp) { - JPanel jp = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); - jp.add(comp); - return jp; + private JPanel seniorMiddlePane() { + rotationBarPane = ReactiveCardPane.create() + .addSupplier("hide", () -> Layouts.row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"), SwingConstants.LEFT)).weight(1.2), + cell(textRotationComboBox).weight(3) + ).getComponent()) + .addSupplier("show", () -> Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"), SwingConstants.LEFT)).weight(1.2), + cell(textRotationComboBox).weight(3) + ), + row( + flex(1.2), + cell(rotationPane).weight(3) + ) + ).getComponent()); + rotationBarPane.select("show").populate(); + + textRotationComboBox.addItemListener(e -> { + String key = (textRotationComboBox.getSelectedIndex() == 0) ? "show" : "hide"; + rotationBarPane.select(key).populate(); + }); + return rotationBarPane; + } + + private JPanel seniorDownPane() { + UILabel indentationLabel = new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Indentation")), SwingConstants.LEFT); + UILabel partSpacingLabel = new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Part_Spacing")), SwingConstants.LEFT); + UILabel spacingLabel = new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing")), SwingConstants.LEFT); + + return Layouts.column( + row( + cell(indentationLabel).weight(1.2), + cell(leftIndentSpinner).weight(1.4), + flex(0.2), + cell(rightIndentSpinner).weight(1.4) + ), + fix(2), + row( + flex(1.2), + cell(new UILabel((Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER)).weight(1.4), + flex(0.2), + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Right")), SwingConstants.CENTER)).weight(1.4) + ), + fix(10), + row( + cell(partSpacingLabel).weight(1.2), + cell(spaceBeforeSpinner).weight(1.4), + flex(0.2), + cell(spaceAfterSpinner).weight(1.4) + ), + fix(2), + row( + flex(1.2), + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Front")), SwingConstants.CENTER)).weight(1.4), + flex(0.2), + cell(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Behind")), SwingConstants.CENTER)).weight(1.4) + ), + fix(10), + row( + cell(spacingLabel).weight(1.2), + cell(lineSpaceSpinner).weight(1.4), + flex(1.6) + ) + ).getComponent(); } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java b/designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java index 3e0f6c2130..0b3f94f0a5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java @@ -1,13 +1,11 @@ package com.fr.design.gui.style; +import com.fine.swing.ui.layout.Layouts; import com.fr.base.Style; import com.fr.design.ExtraDesignClassManager; import com.fr.design.constants.LayoutConstants; import com.fr.design.fun.BackgroundQuickUIProvider; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.*; import com.fr.general.Background; @@ -21,6 +19,8 @@ import java.awt.event.ItemListener; import java.util.ArrayList; import java.util.Set; +import static com.fine.swing.ui.layout.Layouts.cell; + /** * @author zhou * @since 2012-5-28下午6:22:09 @@ -45,7 +45,7 @@ public class BackgroundPane extends AbstractBasicStylePane { } protected void initComponents() { - this.setLayout(new BorderLayout(0, 6)); + this.setLayout(new BorderLayout()); typeComboBox = new UIComboBox(); final CardLayout cardlayout = new CardLayout(); @@ -75,19 +75,9 @@ public class BackgroundPane extends AbstractBasicStylePane { } }); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - Component[][] components = new Component[][]{ - new Component[]{null}, - new Component[]{typeComboBox}, - new Component[]{centerPane} - }; - double[] rowSize = {p, p, p}; - double[] columnSize = {f}; - int[][] rowCount = {{1},{1},{1}}; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM); - this.add(panel, BorderLayout.CENTER); - + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(typeComboBox), cell(centerPane) + ).getComponent(),BorderLayout.CENTER); } protected BackgroundQuickPane[] supportKindsOfBackgroundUI() { diff --git a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java index d2a302ea01..81759d5f04 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java @@ -4,6 +4,10 @@ package com.fr.design.gui.style; * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved. */ +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.CellBorderStyle; import com.fr.base.Style; import com.fr.design.constants.LayoutConstants; @@ -13,8 +17,6 @@ import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane; import com.fr.design.style.color.NewColorSelectBox; import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils; @@ -22,29 +24,32 @@ import com.fr.general.IOUtils; import com.fr.stable.Constants; import com.fr.stable.CoreConstants; +import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.JPanel; import javax.swing.SwingConstants; +import javax.swing.UIManager; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.GridLayout; +import java.awt.*; import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * @author zhou * @since 2012-5-28下午6:22:04 */ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObserver { - private static final String[] BORDERARRAY = {"currentLineCombo", "currentLineColorPane", "outerToggleButton", "topToggleButton", + private static final String[] BORDER_ARRAY = {"currentLineCombo", "currentLineColorPane", "outerToggleButton", "topToggleButton", "leftToggleButton", "bottomToggleButton", "rightToggleButton", "innerToggleButton", "horizontalToggleButton", "verticalToggleButton"}; - private static final Set BORDER_SET = new HashSet<>(Arrays.asList(BORDERARRAY)); + private static final Set BORDER_SET = new HashSet<>(Arrays.asList(BORDER_ARRAY)); private UIToggleButton topToggleButton; private UIToggleButton horizontalToggleButton; @@ -67,7 +72,22 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse protected void initComponents() { initButtonsWithIcon(); - this.setLayout(new BorderLayout(0, 0)); + + JPanel borderPane = initBorderPane(); + JPanel backgroundPane = initBackgroundPane(); + this.setLayout(new BorderLayout()); + this.add(Layouts.column( + cell(new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), 280, 24, borderPane)), + fix(1).with(it -> it.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("defaultBorderColor")))), + cell(new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 280, 24, backgroundPane)) + ).getComponent()); + + initAllNames(); + outerToggleButton.addChangeListener(outerToggleButtonChangeListener); + innerToggleButton.addChangeListener(innerToggleButtonChangeListener); + } + + private JPanel initBorderPane() { JPanel externalPane = new JPanel(new GridLayout(0, 4)); externalPane.add(topToggleButton); externalPane.add(leftToggleButton); @@ -76,40 +96,44 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse JPanel insidePane = new JPanel(new GridLayout(0, 2)); insidePane.add(horizontalToggleButton); insidePane.add(verticalToggleButton); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - Component[][] components = new Component[][]{ - new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style") + " ", SwingConstants.LEFT), currentLineCombo}, - new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + " ", SwingConstants.LEFT), currentLineColorPane}, - new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Out_Border") + " ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("com/fr/design/images/m_format/out.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)}, - new Component[]{null, externalPane}, - new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border") + " ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("com/fr/design/images/m_format/in.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)}, - new Component[]{null, insidePane}, - new Component[]{null, null} - }; - double[] rowSize = {p, p, p, p, p, p, p, p, p, p, p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM); - JPanel borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), 280, 24, panel); - this.add(borderPanel, BorderLayout.NORTH); + return Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style"), SwingConstants.LEFT)).weight(1.2), + cell(currentLineCombo).weight(3)), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"), SwingConstants.LEFT)).weight(1.2), + cell(currentLineColorPane).weight(3)), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Out_Border"), SwingConstants.LEFT)).weight(1.2), + cell(outerToggleButton = new UIToggleButton(new Icon[]{new LazyIcon("out"), + IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)). + with(it -> it.setPreferredSize(new Dimension(-1, FineUIScale.scale(24)))).weight(3)), + row( + flex(1.2), + cell(externalPane).with(it -> it.setPreferredSize(new Dimension(-1, FineUIScale.scale(24)))).weight(3)), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border"), SwingConstants.LEFT)).weight(1.2), + cell(innerToggleButton = new UIToggleButton(new Icon[]{new LazyIcon("in"), + IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)). + with(it -> it.setPreferredSize(new Dimension(-1, FineUIScale.scale(24)))).weight(3)), + row( + flex(1.2), + cell(insidePane).with(it -> it.setPreferredSize(new Dimension(-1, FineUIScale.scale(24)))).weight(3)) + ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, LayoutConstants.VERTICAL_GAP, 0))).getComponent(); + } + private JPanel initBackgroundPane() { UILabel backgroundFillLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Background_Fill")); - backgroundFillLabel.setPreferredSize(new Dimension(60, 20)); - backgroundPane = new BackgroundPane(); - JPanel backgroundContainPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{backgroundFillLabel, backgroundPane}}, - TableLayoutHelper.FILL_LASTCOLUMN, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM); - - JPanel backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 280, 24, backgroundContainPane); - this.add(backgroundPanel, BorderLayout.CENTER); - initAllNames(); - outerToggleButton.addChangeListener(outerToggleButtonChangeListener); - innerToggleButton.addChangeListener(innerToggleButtonChangeListener); + return Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(backgroundFillLabel).with(it -> { + it.setBorder(new ScaledEmptyBorder(LayoutConstants.VGAP_MEDIUM, 0, 0, 0)); + it.setVerticalAlignment(SwingConstants.TOP); + }).weight(1.2), + cell(backgroundPane).weight(3) + ) + ).getComponent(); } ChangeListener outerToggleButtonChangeListener = new ChangeListener() { @@ -133,12 +157,13 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse }; private void initButtonsWithIcon() { - topToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/top.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/top_white.png")}, false); - leftToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/left.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/left_white.png")}, false); - bottomToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bottom_white.png")}, false); - rightToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/right_white.png")}, false); - horizontalToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/horizontal_white.png")}, false); - verticalToggleButton = new UIToggleButton(new Icon[]{IOUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/vertical_white.png")}, false); + // todo: 暂缺视觉反白图标 + topToggleButton = new UIToggleButton(new Icon[]{new LazyIcon("top"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/top_white.png")}, false); + leftToggleButton = new UIToggleButton(new Icon[]{new LazyIcon("left"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/left_white.png")}, false); + bottomToggleButton = new UIToggleButton(new Icon[]{new LazyIcon("bottom"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bottom_white.png")}, false); + rightToggleButton = new UIToggleButton(new Icon[]{new LazyIcon("right"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/right_white.png")}, false); + horizontalToggleButton = new UIToggleButton(new Icon[]{new LazyIcon("horizontal"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/horizontal_white.png")}, false); + verticalToggleButton = new UIToggleButton(new Icon[]{new LazyIcon("vertical"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/vertical_white.png")}, false); this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY); this.currentLineColorPane = new NewColorSelectBox(100); } diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java index 8af5c08d40..9c9a68f466 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java @@ -4,7 +4,8 @@ package com.fr.design.gui.style; * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved. */ -import com.fr.base.BaseUtils; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; import com.fr.base.FRContext; import com.fr.base.Style; import com.fr.base.Utils; @@ -16,8 +17,7 @@ import com.fr.design.gui.ibutton.UIColorButton; import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; +import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.utils.DesignUtils; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; @@ -26,24 +26,14 @@ import com.fr.general.FRFont; import com.fr.stable.Constants; -import javax.swing.BorderFactory; import javax.swing.JFrame; import javax.swing.JPanel; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.awt.BorderLayout; -import java.awt.CardLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.GridLayout; -import java.awt.RenderingHints; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import java.util.Vector; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * Pane to edit Font. */ @@ -54,12 +44,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse 36, 38, 40, 48, 64, 72, 128 }; private static final int MAX_FONT_SIZE = 100; - private static final Dimension BUTTON_SIZE = new Dimension(20, 18); - private static final Dimension UNDER_LINE_SIZE = new Dimension(87, 20); - private static final Dimension HIDE_SIZE = new Dimension(0, 0); private final String[] fontSizeStyles = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Plain"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bold"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Italic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bolditalic")}; - private JPanel buttonPane; - private JPanel isSuperOrSubPane; private UIComboBox fontNameComboBox; private UIComboBox fontSizeStyleComboBox; protected UIComboBox fontSizeComboBox; @@ -76,19 +61,14 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse private UIToggleButton isShadowCheckBox; private UIToggleButton superPane; private UIToggleButton subPane; - private JPanel linePane; - private int italic_bold; - /** - * LeftPane和RightPane之间的间隙，也是fontSizeStyleComboBox与fontSizeComboBox之间的间隙，之前的默认值为VGAP_LARGE - */ - private int hGapBetweenLeftPaneAndRightPane = LayoutConstants.VGAP_LARGE; + private UIToolbar styleToolbar; public FRFontPane() { this.initComponents(); } + @Deprecated public FRFontPane(int hGapBetweenLeftPaneAndRightPane) { - this.hGapBetweenLeftPaneAndRightPane = hGapBetweenLeftPaneAndRightPane; this.initComponents(); } @@ -123,17 +103,11 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse this.colorSelectPane.setColor(frFont.getForeground()); this.colorSelectPane.repaint(); // update frFont. - - CardLayout cly = (CardLayout) linePane.getLayout(); int line = frFont.getUnderline(); if (line == Constants.LINE_NONE) { underline.setSelected(false); - cly.show(linePane, "none"); - linePane.setPreferredSize(HIDE_SIZE); } else { underline.setSelected(true); - cly.show(linePane, "combobox"); - linePane.setPreferredSize(UNDER_LINE_SIZE); this.underlineCombo.setSelectedLineStyle(line); } // effects @@ -149,6 +123,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse this.superPane.setSelected(false); this.subPane.setSelected(false); } + underlineCombo.setVisible(underline.isSelected()); } /** @@ -231,7 +206,6 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse @Override public Style update(Style style) { - // TODO Auto-generated method stub FRFont frFont = style.getFRFont(); frFont = this.update(frFont); return style.deriveFRFont(frFont); @@ -248,44 +222,48 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse protected void initComponents() { fontSizeStyleComboBox = new UIComboBox(fontSizeStyles); fontNameComboBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report()); - fontNameComboBox.setPreferredSize(new Dimension(144, 20)); fontSizeComboBox = new UIComboBox(getFontSizes()); fontSizeComboBox.setEditable(true); - this.underlineCombo = new LineComboBox(UIConstants.BORDER_LINE_STYLE_ARRAY); + underlineCombo = new LineComboBox(UIConstants.BORDER_LINE_STYLE_ARRAY); colorSelectPane = new UIColorButton(); - bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png")); - italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png")); - underline = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline.png")); - bold.setPreferredSize(BUTTON_SIZE); - italic.setPreferredSize(BUTTON_SIZE); - underline.setPreferredSize(BUTTON_SIZE); - isStrikethroughCheckBox = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/strikethrough.png")); - isStrikethroughCheckBox.setPreferredSize(BUTTON_SIZE); - isShadowCheckBox = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/shadow.png")); - isShadowCheckBox.setPreferredSize(BUTTON_SIZE); - superPane = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/sup.png")); - superPane.setPreferredSize(BUTTON_SIZE); - subPane = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/sub.png")); - subPane.setPreferredSize(BUTTON_SIZE); - Component[] SuperOrSubComponents = new Component[]{ - superPane, subPane - }; - isSuperOrSubPane = new JPanel(new BorderLayout()); - isSuperOrSubPane.add(GUICoreUtils.createFlowPane(SuperOrSubComponents, FlowLayout.LEFT, LayoutConstants.HGAP_SMALL)); - Component[] components_font = new Component[]{ - colorSelectPane, underline, isStrikethroughCheckBox, isShadowCheckBox - }; - buttonPane = new JPanel(new BorderLayout()); - buttonPane.add(GUICoreUtils.createFlowPane(components_font, FlowLayout.LEFT, LayoutConstants.HGAP_SMALL)); - linePane = new JPanel(new CardLayout()); + bold = new UIToggleButton(new LazyIcon("bold")); + italic = new UIToggleButton(new LazyIcon("italic")); + underline = new UIToggleButton(new LazyIcon("underline")); + isStrikethroughCheckBox = new UIToggleButton(new LazyIcon("strike")); + isShadowCheckBox = new UIToggleButton(new LazyIcon("shadow")); + superPane = new UIToggleButton(new LazyIcon("super")); + subPane = new UIToggleButton(new LazyIcon("sub")); + styleToolbar = createToolbar(); initAllNames(); setToolTips(); + initListeners(); + + underlineCombo.setVisible(false); this.setLayout(new BorderLayout()); - this.add(createPane(), BorderLayout.CENTER); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(fontNameComboBox), + row(5, + cell(fontSizeStyleComboBox).weight(1), + cell(fontSizeComboBox).weight(1)), + cell(styleToolbar), + cell(underlineCombo) + ).getComponent(), BorderLayout.CENTER); + DefaultValues defaultValues = FRContext.getDefaultValues(); populateBean(defaultValues.getFRFont()); } + private UIToolbar createToolbar() { + UIToolbar toolbar = new UIToolbar(); + toolbar.add(colorSelectPane); + toolbar.add(underline); + toolbar.add(isStrikethroughCheckBox); + toolbar.add(isShadowCheckBox); + toolbar.add(superPane); + toolbar.add(subPane); + return toolbar; + } + private void initAllNames() { fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Style")); fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name")); @@ -312,63 +290,8 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse subPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Subscript")); } - - private JPanel createLinePane() { - linePane.add(new JPanel(), "none"); - JPanel gap = new JPanel(new GridLayout(0, 1)); - gap.add(underlineCombo); - linePane.add(gap, "combobox"); - underline.addChangeListener(new ChangeListener() { - - @Override - public void stateChanged(ChangeEvent e) { - CardLayout cly = (CardLayout) linePane.getLayout(); - cly.show(linePane, underline.isSelected() ? "combobox" : "none"); - if(underline.isSelected()){ - linePane.setPreferredSize(UNDER_LINE_SIZE); - }else{ - linePane.setPreferredSize(HIDE_SIZE); - } - } - }); - - return linePane; - } - - private JPanel createLeftPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p}; - double[] rowSize = {p, p, p}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; - Component[][] components = new Component[][]{ - new Component[]{fontSizeStyleComboBox}, - new Component[]{buttonPane}, - new Component[]{createLinePane()} - }; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); - } - - protected JPanel createRightPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {f}; - double[] rowSize = {p, p}; - int[][] rowCount = {{1, 1}, {1, 1}}; - Component[][] components = new Component[][]{ - new Component[]{fontSizeComboBox}, - new Component[]{isSuperOrSubPane} - }; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); - } - - private JPanel createPane() { - JPanel createPane = new JPanel(new BorderLayout()); - createPane.add(fontNameComboBox, BorderLayout.NORTH); - JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{createLeftPane(), createRightPane()}}, TableLayoutHelper.FILL_LASTCOLUMN, hGapBetweenLeftPaneAndRightPane, LayoutConstants.VGAP_LARGE); - jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); - createPane.add(jPanel, BorderLayout.CENTER); - return createPane; + private void initListeners() { + underline.addChangeListener(e -> underlineCombo.setVisible(underline.isSelected())); } /** @@ -388,53 +311,4 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse public void setGlobalName(String name) { } - private class TwoButtonPane extends JPanel { - public UIToggleButton leftButton; - public UIToggleButton rightButton; - - public TwoButtonPane(UIToggleButton leftButton, UIToggleButton rightButton) { - this.leftButton = leftButton; - this.rightButton = rightButton; - this.setLayout(new FlowLayout(FlowLayout.LEFT, 1, 0)); - this.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1)); - initButton(leftButton); - initButton(rightButton); - initListener(); - } - - private void initListener() { - leftButton.addMouseListener(new MouseAdapter() { - public void mousePressed(MouseEvent e) { - rightButton.setSelected(false); - } - }); - rightButton.addMouseListener(new MouseAdapter() { - public void mousePressed(MouseEvent e) { - leftButton.setSelected(false); - } - }); - } - - private void initButton(UIToggleButton button) { - button.setRoundBorder(false); - button.setBorderPainted(false); - this.add(button); - } - - - protected void paintBorder(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - g2d.setColor(UIConstants.LINE_COLOR); - int buttonX = getComponent(0).getX(); - int buttonY = getComponent(0).getY(); - int height = getComponent(0).getHeight(); - int width = getComponent(0).getWidth(); - g.drawLine(buttonX + width, 0, buttonX + width, height); - width += getComponent(1).getWidth(); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - - g2d.drawRoundRect(buttonX - 1, buttonY - 1, width + 2, getHeight() - 1, UIConstants.ARC, UIConstants.ARC); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - } - } } diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java b/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java index bf06aa2fd7..d4b7db8281 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java @@ -1,5 +1,7 @@ package com.fr.design.gui.style; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.TemplateTheme; import com.fr.design.dialog.BasicPane; import com.fr.design.event.UIObserver; @@ -15,10 +17,10 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.JTemplate; import com.fr.design.widget.FRWidgetFactory; -import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; @@ -45,7 +47,7 @@ public class FollowingThemePane extends BasicPane implements UIObserver { public FollowingThemePane(String name) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + this.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); followingThemeButtonGroup = new UIButtonGroup<>(FOLLOWING_THEME_STRING_ARRAYS); followingThemeButtonGroup.setAutoFireStateChanged(false); @@ -74,9 +76,9 @@ public class FollowingThemePane extends BasicPane implements UIObserver { double f = TableLayout.FILL; JPanel followingThemePane = TableLayoutHelper.createGapTableLayoutPane( new Component[][]{new Component[] { followingThemeLabel, FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(followingThemeButtonGroup)}}, - new double[] { p }, new double[] { SETTING_LABEL_WIDTH, f }, 10, 0); - followingThemePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + new double[] { p }, new double[] {FineUIScale.scale(SETTING_LABEL_WIDTH), f }, 10, 0); followingThemePane.setVisible(false); + followingThemePane.setPreferredSize(new Dimension(FineUIScale.scale(275), (int) followingThemePane.getPreferredSize().getHeight())); add(followingThemePane, BorderLayout.NORTH); container = FRGUIPaneFactory.createBorderLayout_S_Pane(); diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java index 2485b4de4e..8ab812e9dc 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java @@ -1,7 +1,10 @@ package com.fr.design.gui.style; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.CoreDecimalFormat; -import com.fr.base.GraphHelper; import com.fr.base.Style; import com.fr.base.TextFormat; import com.fr.data.core.FormatField; @@ -10,7 +13,6 @@ import com.fr.design.event.UIObserverListener; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.i18n.Toolkit; import com.fr.design.border.UIRoundedBorder; -import com.fr.design.constants.LayoutConstants; import com.fr.design.constants.UIConstants; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; @@ -18,26 +20,19 @@ import com.fr.design.gui.icombobox.TextFontComboBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; import java.awt.BorderLayout; -import java.awt.CardLayout; import java.awt.Color; import java.awt.Component; -import java.awt.Dimension; -import java.awt.FontMetrics; -import java.awt.Graphics; import java.math.RoundingMode; import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.SwingConstants; -import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.border.TitledBorder; import java.awt.event.ItemEvent; @@ -53,13 +48,7 @@ import java.text.SimpleDateFormat; */ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObserver { private static final long serialVersionUID = 724330854437726751L; - - private static final int LABEL_X = 4; - private static final int LABEL_Y = 18; - private static final int LABEL_DELTA_WIDTH = 8; - private static final int LABEL_HEIGHT = 15; //标签背景的范围 private static final int CURRENCY_FLAG_POINT = 6; - private static final Border LEFT_BORDER = BorderFactory.createEmptyBorder(0, 30, 0, 0); private static final Integer[] TYPES = new Integer[]{ FormatContents.NULL, FormatContents.NUMBER, @@ -85,6 +74,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse private boolean isRightFormat; private boolean isDate = false; private GlobalNameListener globalNameListener = null; + private JPanel self = this; /** * Constructor. @@ -98,14 +88,10 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse } protected void initComponents(Integer[] types) { - this.setLayout(new BorderLayout(0, 4)); + this.setLayout(new BorderLayout()); initSampleLabel(); - contentPane = new JPanel(new BorderLayout(0, 4)) { - @Override - public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, 65); - } - }; + contentPane = new JPanel(); + contentPane.setLayout(new BorderLayout(0, FineUIScale.scale(10))); typeComboBox = new UIComboBox(types); UIComboBoxRenderer render = createComBoxRender(); typeComboBox.setRenderer(render); @@ -113,7 +99,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse typeComboBox.setGlobalName("typeComboBox"); contentPane.add(sampleLabel, BorderLayout.NORTH); - txtCenterPane = new JPanel(new BorderLayout()); + txtCenterPane = new JPanel(new BorderLayout(0, FineUIScale.scale(10))); textField = new TextFontComboBox(); textField.addItemListener(textFieldItemListener); textField.setEditable(true); @@ -122,58 +108,39 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse contentPane.add(txtCenterPane, BorderLayout.CENTER); - centerPane = new JPanel(new CardLayout()); - centerPane.add(new JPanel(), "hide"); - centerPane.setPreferredSize(new Dimension(0, 0)); - centerPane.add(contentPane, "show"); - + centerPane = new JPanel(new BorderLayout()); + centerPane.add(contentPane); frFontPane = new FRFontPane(); UILabel font = new UILabel(Toolkit.i18nText("Fine-Design_Form_FR_Font"), SwingConstants.LEFT); JPanel fontPane = new JPanel(new BorderLayout()); fontPane.add(font, BorderLayout.NORTH); - typeComboBox.setPreferredSize(new Dimension(155,20)); JPanel typePane = new JPanel(new BorderLayout()); typePane.add(typeComboBox, BorderLayout.CENTER); - typePane.setBorder(LEFT_BORDER); -// centerPane.setBorder(LEFT_BORDER); - frFontPane.setBorder(LEFT_BORDER); JPanel option = new JPanel(new BorderLayout()); option.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option"), SwingConstants.LEFT), BorderLayout.WEST); roundingBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Base_Option_Half_Up")); - roundingBox.setBorder(BorderFactory.createEmptyBorder(0, 40, 0, 0)); - roundingBox.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - } - }); roundingBox.setGlobalName("roundingBox"); option.add(roundingBox, BorderLayout.CENTER); - optionPane = new JPanel(new CardLayout()); - optionPane.add(new JPanel(), "hide"); - optionPane.setPreferredSize(new Dimension(0, 0)); - optionPane.add(option, "show"); + optionPane = new JPanel(new BorderLayout()); + optionPane.add(option); Component[][] components = getComponent(fontPane, centerPane, typePane); this.add(createContentPane(components), BorderLayout.CENTER); + centerPane.setVisible(!isTextOrNull()); } protected JPanel createContentPane (Component[][] components) { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] rowSize = {p, p, p, p, p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM); + return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); } protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format")), typePane}, new Component[]{centerPane, null}, new Component[]{optionPane, null}, new Component[]{fontPane, frFontPane}, @@ -194,41 +161,17 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse } private void initSampleLabel() { + Color labelColor = FineUIUtils.getUIColor("Label.tipColor", "inactiveCaption"); Border interBorder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4); String title = Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample"); - Border border = BorderFactory.createTitledBorder(interBorder, title, TitledBorder.LEFT, 0, null, UIConstants.LINE_COLOR); - sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) { - - @Override - public void paint(Graphics g) { - super.paint(g); - int width = getWidth(); - Color original = g.getColor(); - g.setColor(getBackground()); - g.fillRect(LABEL_X, LABEL_Y, width - LABEL_DELTA_WIDTH, LABEL_HEIGHT); - g.setColor(UIConstants.LINE_COLOR); - FontMetrics cellFM = g.getFontMetrics(); - int textWidth = cellFM.stringWidth(getText()); - GraphHelper.drawString(g, getText(), (width - textWidth) / 2, 26); - g.setColor(original); - } - }; + Border border = BorderFactory.createTitledBorder(interBorder, title, TitledBorder.LEFT, 0, null, labelColor); + sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()); sampleLabel.setHorizontalAlignment(UILabel.CENTER); sampleLabel.setBorder(border); + FineUIStyle.setStyle(sampleLabel, FineUIStyle.LABEL_TIP); } - @Override - /** - * 得到合适的大小 - */ - public Dimension getPreferredSize() { - if (this.typeComboBox.getSelectedIndex() == FormatContents.NULL) { - return typeComboBox.getPreferredSize(); - } - return super.getPreferredSize(); - } - /** * 弹出框标题 * @@ -340,7 +283,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse */ private void refreshPreviewLabel() { this.sampleLabel.setText(FormatField.getInstance().getFormatValue()); - this.sampleLabel.setForeground(UIManager.getColor("Label.foreground")); + FineUIStyle.setStyle(sampleLabel, FineUIStyle.LABEL_TIP); try { isRightFormat = true; if (StringUtils.isEmpty(String.valueOf(textField.getSelectedItem()))) { @@ -369,38 +312,30 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObse if (e.getStateChange() == ItemEvent.SELECTED) { int contents = getFormatContents(); String[] items = FormatField.getInstance().getFormatArray(contents, false); - CardLayout cardLayout = (CardLayout) centerPane.getLayout(); if (isTextOrNull()) { - centerPane.setPreferredSize(new Dimension(0, 0)); - cardLayout.show(centerPane, "hide"); + centerPane.setVisible(false); } else { textField.removeAllItems(); textField.setItemArray(items); textField.setSelectedIndex(0); - centerPane.setPreferredSize(new Dimension(270, 65)); - cardLayout.show(centerPane, "show"); + centerPane.setVisible(true); } - CardLayout optionLayout = ((CardLayout) optionPane.getLayout()); if (getFormatContents() == FormatContents.PERCENT) { - optionPane.setPreferredSize(new Dimension(100, 20)); - optionLayout.show(optionPane, "show"); + optionPane.setVisible(true); } else { - optionPane.setPreferredSize(new Dimension(0, 0)); - optionLayout.show(optionPane, "hide"); + optionPane.setVisible(false); roundingBox.setSelected(false); } + self.repaint(); } } }; - ItemListener textFieldItemListener = new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - if (e.getStateChange() == ItemEvent.SELECTED) { - refreshPreviewLabel(); - } + ItemListener textFieldItemListener = e -> { + if (e.getStateChange() == ItemEvent.SELECTED) { + refreshPreviewLabel(); } }; diff --git a/designer-base/src/main/java/com/fr/design/gui/style/TextFontTippedPane.java b/designer-base/src/main/java/com/fr/design/gui/style/TextFontTippedPane.java index 7f11b0d4bf..0924eb7a7e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/TextFontTippedPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/TextFontTippedPane.java @@ -1,21 +1,21 @@ package com.fr.design.gui.style; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.Style; import com.fr.design.constants.LayoutConstants; -import com.fr.design.designer.IntervalConstants; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.theme.edit.ui.LabelUtils; -import javax.swing.BorderFactory; +import javax.swing.SwingConstants; import javax.swing.JPanel; import javax.swing.JTextArea; import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; + +import static com.fine.swing.ui.layout.Layouts.cell; /** @@ -33,7 +33,7 @@ public class TextFontTippedPane extends AbstractBasicStylePane { private void initializePane(boolean showFormatTip) { setLayout(new BorderLayout()); - setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0)); + setBorder(new ScaledEmptyBorder(LayoutConstants.VERTICAL_GAP, 0, 0, 0)); fontPane = new FRFontPane(); this.add(createLabeledPane(Toolkit.i18nText("Fine-Design_Form_FR_Font"), fontPane), BorderLayout.NORTH); @@ -45,24 +45,21 @@ public class TextFontTippedPane extends AbstractBasicStylePane { } private JPanel createLabeledPane(String text, JPanel panel) { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] rowSize = { p }; - double[] columnSize = {p, f}; - UILabel uiLabel = new UILabel(text); - JPanel uiLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - uiLabelPane.add(uiLabel, BorderLayout.NORTH); - - return TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ - new Component[] { uiLabelPane, panel }, - }, rowSize, columnSize, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM); + return Layouts.row( + cell(uiLabel).with(it -> { + it.setVerticalAlignment(SwingConstants.TOP); + it.setBorder(new ScaledEmptyBorder(5, 0, 0, 0)); + }).weight(1), + cell(panel).weight(3) + ).getComponent(); } private JPanel createFormatTipPane() { JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane(); - container.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0)); - JTextArea formatMigratedTip = LabelUtils.createAutoWrapLabel(Toolkit.i18nText("Fine-Design_Report_Format_Style_Migrated_Tip"), new Color(153, 153, 153)); + container.setBorder(new ScaledEmptyBorder(LayoutConstants.VERTICAL_GAP, 0, 0, 0)); + JTextArea formatMigratedTip = LabelUtils.createAutoWrapLabel(Toolkit.i18nText("Fine-Design_Report_Format_Style_Migrated_Tip"), + FineUIUtils.getUIColor("Label.tipColor", "inactiveCaption")); container.add(formatMigratedTip, BorderLayout.NORTH); return container; diff --git a/designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java b/designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java index 0b8e8287ab..a86bc70e05 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java @@ -1,12 +1,14 @@ package com.fr.design.gui.style; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.CoreDecimalFormat; -import com.fr.base.GraphHelper; import com.fr.base.Style; import com.fr.base.TextFormat; import com.fr.data.core.FormatField; import com.fr.data.core.FormatField.FormatContents; import com.fr.design.border.UIRoundedBorder; +import com.fr.design.constants.LayoutConstants; import com.fr.design.constants.UIConstants; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; @@ -21,17 +23,14 @@ import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; import javax.swing.BorderFactory; -import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JList; -import javax.swing.JPanel; import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.border.TitledBorder; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; -import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.event.ItemEvent; @@ -40,6 +39,12 @@ import java.math.RoundingMode; import java.text.Format; import java.text.SimpleDateFormat; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fr.design.constants.LayoutConstants.LEFT_WEIGHT; +import static com.fr.design.constants.LayoutConstants.RIGHT_WEIGHT; + /** * @author Starryi * @version 1.0 @@ -92,7 +97,6 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName typeComboBox.setRenderer(createComBoxRender()); typeComboBox.addItemListener(itemListener); typeComboBox.setGlobalName("typeComboBox"); - typeComboBox.setPreferredSize(new Dimension(155,20)); } private void initTextFontComboBox4GeneralFormats() { @@ -104,49 +108,34 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName private void initRoundingCheckBox4PercentFormat() { roundingBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Base_Option_Half_Up")); - roundingBox.setBorder(BorderFactory.createEmptyBorder(0, 30, 0, 0)); - roundingBox.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - } - }); roundingBox.setGlobalName("roundingBox"); } private void initPreviewLabel4GeneralFormat() { - Border interBorder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4); + Color labelColor = FineUIUtils.getUIColor("Label.tipColor", "inactiveCaption"); + Border interBorder = new UIRoundedBorder(UIConstants.LINE_COLOR, 0, 4); String title = Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample"); - Border border = BorderFactory.createTitledBorder(interBorder, title, TitledBorder.LEFT, 0, null, UIConstants.LINE_COLOR); - previewLabel = new UILabel(FormatField.getInstance().getFormatValue()) { - - @Override - public void paint(Graphics g) { - super.paint(g); - int width = getWidth(); - Color original = g.getColor(); - g.setColor(getBackground()); - g.fillRect(LABEL_X, LABEL_Y, width - LABEL_DELTA_WIDTH, LABEL_HEIGHT); - g.setColor(UIConstants.LINE_COLOR); - FontMetrics cellFM = g.getFontMetrics(); - int textWidth = cellFM.stringWidth(getText()); - GraphHelper.drawString(g, getText(), (width - textWidth) / 2F, 26); - g.setColor(original); - } - }; + Border border = BorderFactory.createTitledBorder(interBorder, title, TitledBorder.ABOVE_TOP, 0, null, labelColor); + previewLabel = new UILabel(FormatField.getInstance().getFormatValue()); previewLabel.setHorizontalAlignment(UILabel.CENTER); previewLabel.setBorder(border); + FineUIStyle.setStyle(previewLabel, FineUIStyle.LABEL_TIP); } protected void initLayout() { - JPanel labeledFormatTypeComboBoxPane = new JPanel(new BorderLayout(20, 0)); - labeledFormatTypeComboBoxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format")), BorderLayout.WEST); - labeledFormatTypeComboBoxPane.add(typeComboBox, BorderLayout.CENTER); - - JPanel labeledRoundingCheckboxPane = new JPanel(new BorderLayout(0, 0)); - labeledRoundingCheckboxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option")), BorderLayout.WEST); - labeledRoundingCheckboxPane.add(roundingBox, BorderLayout.CENTER); - - addComponents(4, new JComponent[] { labeledFormatTypeComboBoxPane, textField, labeledRoundingCheckboxPane, previewLabel}); + this.setLayout(new BorderLayout()); + this.add(column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format"))).weight(LEFT_WEIGHT), + cell(typeComboBox).weight(RIGHT_WEIGHT) + ), + cell(textField), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option"))).weight(LEFT_WEIGHT), + cell(roundingBox).weight(RIGHT_WEIGHT) + ), + cell(previewLabel) + ).getComponent()); } protected void setTextFieldVisible(boolean visible) { @@ -161,21 +150,6 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName previewLabel.setVisible(visible); } - protected void addComponents(int gap, JComponent[] components) { - JPanel container = this; - container.setLayout(new BorderLayout(0, gap)); - for (JComponent component: components) { - if (component != null) { - container.add(component, BorderLayout.NORTH); - JPanel nextContainer = new JPanel(new BorderLayout(0, gap)); - container.add(nextContainer, BorderLayout.CENTER); - container = nextContainer; - } - } - if (container.getComponentCount() == 0) { - container.getParent().remove(container); - } - } protected UIComboBoxRenderer createComBoxRender() { return new UIComboBoxRenderer() { @@ -190,18 +164,6 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName }; } - - @Override - /** - * 得到合适的大小 - */ - public Dimension getPreferredSize() { - if (this.typeComboBox.getSelectedIndex() == FormatContents.NULL) { - return typeComboBox.getPreferredSize(); - } - return super.getPreferredSize(); - } - /** * 弹出框标题 * @@ -311,7 +273,7 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName */ private void refreshPreviewLabel() { this.previewLabel.setText(FormatField.getInstance().getFormatValue()); - this.previewLabel.setForeground(UIManager.getColor("Label.foreground")); + FineUIStyle.setStyle(previewLabel, FineUIStyle.LABEL_TIP); try { isRightFormat = true; if (StringUtils.isEmpty(String.valueOf(textField.getSelectedItem()))) { @@ -364,17 +326,11 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName }; @Override - /** - * populate - */ public void populateBean(Style style) { this.populateBean(style.getFormat()); } @Override - /** - * update - */ public Style update(Style style) { return updateByGlobalNamedSetting(style); } diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java index 9cdc3b0ef5..728a52336a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java @@ -39,6 +39,7 @@ import javax.swing.text.Document; import javax.swing.text.Element; import javax.swing.text.Highlighter; +import com.fr.design.border.FineBorderFactory; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.focusabletip.FocusableTip; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.Fold; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager; @@ -318,6 +319,7 @@ private boolean fractionalFontMetricsEnabled; * Constructor. */ public RSyntaxTextArea() { + initBorder(); } @@ -328,6 +330,7 @@ private boolean fractionalFontMetricsEnabled; */ public RSyntaxTextArea(RSyntaxDocument doc) { super(doc); + initBorder(); } /** @@ -337,6 +340,7 @@ private boolean fractionalFontMetricsEnabled; */ public RSyntaxTextArea(String text) { super(text); + initBorder(); } @@ -350,6 +354,7 @@ private boolean fractionalFontMetricsEnabled; */ public RSyntaxTextArea(int rows, int cols) { super(rows, cols); + initBorder(); } @@ -364,6 +369,7 @@ private boolean fractionalFontMetricsEnabled; */ public RSyntaxTextArea(String text, int rows, int cols) { super(text, rows, cols); + initBorder(); } @@ -379,6 +385,7 @@ private boolean fractionalFontMetricsEnabled; */ public RSyntaxTextArea(RSyntaxDocument doc, String text,int rows,int cols) { super(doc, text, rows, cols); + initBorder(); } @@ -390,6 +397,7 @@ private boolean fractionalFontMetricsEnabled; */ public RSyntaxTextArea(int textMode) { super(textMode); + initBorder(); } @@ -435,6 +443,11 @@ private boolean fractionalFontMetricsEnabled; } + protected void initBorder() { + setBorder(FineBorderFactory.createWrappedRoundBorder()); + } + + /** * Adds the parser to "validate" the source code in this text area. This diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java index 985a9527fa..db3f50c327 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java @@ -8,6 +8,8 @@ */ package com.fr.design.gui.syntax.ui.rtextarea; +import com.fine.theme.utils.FineUIScale; + import java.awt.AWTEvent; import java.awt.Color; import java.awt.Font; @@ -31,6 +33,9 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Caret; import javax.swing.text.StyleContext; +import static com.fine.theme.utils.FineUIConstants.SCALE_FONT_SIZE_12; +import static com.fine.theme.utils.FineUIConstants.SCALE_FONT_SIZE_13; + /** * This is the base class for RTextArea; basically it's just an @@ -428,19 +433,19 @@ int currentCaretY; // Used to know when to rehighlight current line. if (isOSX()) { // Snow Leopard (1.6) uses Menlo as default monospaced font, // pre-Snow Leopard used Monaco. - font = sc.getFont("Menlo", Font.PLAIN, 12); + font = sc.getFont("Menlo", Font.PLAIN, SCALE_FONT_SIZE_12); if (!"Menlo".equals(font.getFamily())) { - font = sc.getFont("Monaco", Font.PLAIN, 12); + font = sc.getFont("Monaco", Font.PLAIN, SCALE_FONT_SIZE_12); if (!"Monaco".equals(font.getFamily())) { // Shouldn't happen - font = sc.getFont("Monospaced", Font.PLAIN, 13); + font = sc.getFont("Monospaced", Font.PLAIN, SCALE_FONT_SIZE_13); } } } else { // Consolas added in Vista, used by VS2010+. - font = sc.getFont("Consolas", Font.PLAIN, 13); + font = sc.getFont("Consolas", Font.PLAIN, SCALE_FONT_SIZE_13); if (!"Consolas".equals(font.getFamily())) { - font = sc.getFont("Monospaced", Font.PLAIN, 13); + font = sc.getFont("Monospaced", Font.PLAIN, SCALE_FONT_SIZE_13); } } diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java index 42f13ceed5..5d27e3ea7d 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java @@ -4,8 +4,7 @@ import com.fr.base.Utils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.itextfield.UINumberField; -import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.gui.ispinner.UISpinner; import com.fr.js.Hyperlink; import javax.swing.DefaultListCellRenderer; @@ -13,9 +12,10 @@ import javax.swing.JList; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; + +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; public abstract class AbstractHyperNorthPane extends BasicBeanPane { public static final int NEW_WINDOW = 0; @@ -31,11 +31,11 @@ public abstract class AbstractHyperNorthPane extends BasicB /** * 对话框高度输入框 */ - private UINumberField heightTextFiled; + private UISpinner heightTextFiled; /** * 对话框宽度输入框 */ - private UINumberField widthTextFiled; + private UISpinner widthTextFiled; public AbstractHyperNorthPane() { @@ -43,11 +43,10 @@ public abstract class AbstractHyperNorthPane extends BasicB } protected void initComponents() { - this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + this.setLayout(new BorderLayout()); + JPanel centerPane = new JPanel(new BorderLayout()); JPanel headerPane = this.setHeaderPanel(); - this.add(headerPane, BorderLayout.NORTH); - this.add(centerPane, BorderLayout.CENTER); + targetFrameComboBox = new UIComboBox(getTargetFrames()); targetFrameComboBox.setRenderer(new DefaultListCellRenderer() { public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -55,38 +54,36 @@ public abstract class AbstractHyperNorthPane extends BasicB return this; } }); - JPanel targetFramePanel = new JPanel(); - targetFramePanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Link_Opened_In"))); - targetFramePanel.add(targetFrameComboBox); + UILabel targetFrameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Link_Opened_In")); + targetFrameComboBox.setEditable(true); - targetFrameComboBox.setPreferredSize(new Dimension(100, 20)); - - final JPanel newWindowConfPane = new JPanel(); - newWindowConfPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ": ")); - heightTextFiled = new UINumberField(); - heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE)); - heightTextFiled.setPreferredSize(new Dimension(40, 20)); - newWindowConfPane.add(heightTextFiled); - newWindowConfPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ": ")); - widthTextFiled = new UINumberField(); - widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE)); - widthTextFiled.setPreferredSize(new Dimension(40, 20)); - newWindowConfPane.add(widthTextFiled); + + final JPanel newWindowConfPane = new JPanel(new BorderLayout()); + UILabel heightLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height")); + heightTextFiled = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_H_VALUE); + UILabel widthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width")); + widthTextFiled = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_V_VALUE); + newWindowConfPane.add(column(10, + row(cell(heightLabel).weight(0.13), cell(heightTextFiled).weight(0.87)), + row(cell(widthLabel).weight(0.13), cell(widthTextFiled).weight(0.87)) + ).getComponent()); JPanel centerPanel = new JPanel(new BorderLayout()); - centerPanel.add(targetFramePanel, BorderLayout.WEST); - centerPanel.add(newWindowConfPane, BorderLayout.EAST); + + centerPanel.add(column(10, + row(cell(targetFrameLabel).weight(0.13), cell(targetFrameComboBox).weight(0.87)), + cell(newWindowConfPane) + ).getComponent()); newWindowConfPane.setVisible(false); centerPane.add(centerPanel); - targetFrameComboBox.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - newWindowConfPane.setVisible(DIALOG == targetFrameComboBox.getSelectedIndex()); - } - }); + targetFrameComboBox.addActionListener(e -> newWindowConfPane.setVisible(DIALOG == targetFrameComboBox.getSelectedIndex())); - this.add(this.setFootPanel(), BorderLayout.SOUTH); + this.add(column(10, + cell(headerPane), + cell(centerPane), + cell(this.setFootPanel()) + ).getComponent()); } protected String[] getTargetFrames() { @@ -107,19 +104,19 @@ public abstract class AbstractHyperNorthPane extends BasicB this.targetFrameComboBox = targetFrameComboBox; } - public UINumberField getHeightTextFiled() { + public UISpinner getHeightTextFiled() { return heightTextFiled; } - public void setHeightTextFiled(UINumberField heightTextFiled) { + public void setHeightTextFiled(UISpinner heightTextFiled) { this.heightTextFiled = heightTextFiled; } - public UINumberField getWidthTextFiled() { + public UISpinner getWidthTextFiled() { return widthTextFiled; } - public void setWidthTextFiled(UINumberField widthTextFiled) { + public void setWidthTextFiled(UISpinner widthTextFiled) { this.widthTextFiled = widthTextFiled; } @@ -127,8 +124,8 @@ public abstract class AbstractHyperNorthPane extends BasicB public void populateBean(T link) { String name = link.getTargetFrame(); targetFrameComboBox.setSelectedIndex(HyperlinkTargetFrame.convert(name)); - heightTextFiled.setText(String.valueOf(link.getHeight() == 0 ? DEFAULT_H_VALUE : link.getHeight())); - widthTextFiled.setText(String.valueOf(link.getWidth() == 0 ? DEFAULT_V_VALUE : link.getWidth())); + heightTextFiled.setValue(link.getHeight() == 0 ? DEFAULT_H_VALUE : link.getHeight()); + widthTextFiled.setValue(link.getWidth() == 0 ? DEFAULT_V_VALUE : link.getWidth()); populateSubHyperlinkBean(link); } @@ -148,8 +145,8 @@ public abstract class AbstractHyperNorthPane extends BasicB public void updateBean(T link) { updateSubHyperlinkBean(link); link.setTargetFrame(HyperlinkTargetFrame.parse(targetFrameComboBox.getSelectedIndex()).getName()); - link.setHeight(Utils.objectToNumber(heightTextFiled.getText(), false).intValue()); - link.setWidth(Utils.objectToNumber(widthTextFiled.getText(), false).intValue()); + link.setHeight(Utils.objectToNumber(heightTextFiled.getValue(), false).intValue()); + link.setWidth(Utils.objectToNumber(widthTextFiled.getValue(), false).intValue()); } } diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java index 8fa88e9293..ed9ea8a556 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java @@ -1,5 +1,7 @@ package com.fr.design.hyperlink; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseFormula; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; @@ -10,6 +12,7 @@ import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itree.filetree.ReportletPane; @@ -39,6 +42,11 @@ import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 热点链接部分 上方 定义特征 样式 报表 等属性的界面. * @@ -107,7 +115,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane dialogComponents = new ArrayList<>(); final List othersComponents = new ArrayList<>(); @@ -127,7 +135,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane dialogComponents, List othersComponents) { //最上方位置的面板 JPanel headerPane = this.setHeaderPanel(); - Component[] headerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet") + ":"), headerPane}; + Component[] headerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet")), headerPane}; dialogComponents.add(headerComponents); othersComponents.add(headerComponents); } @@ -343,10 +353,9 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane dialogComponents) {// 对话框大小 - final JPanel sizeJPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - UILabel heightLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height") + ":"); - heightLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10)); - sizeJPanel.add(heightLabel); - UINumberField heightTextFiled = new UINumberField(); - heightTextFiled.setMinValue(0); - heightTextFiled.canFillNegativeNumber(false); - heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE)); - heightTextFiled.setPreferredSize(new Dimension(40, 20)); - sizeJPanel.add(heightTextFiled); + final JPanel sizePane = new JPanel(new BorderLayout()); + UILabel heightLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height")); + UISpinner heightTextFiled = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_H_VALUE); this.setHeightTextFiled(heightTextFiled); - UILabel widthLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":"); - widthLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10)); - sizeJPanel.add(widthLabel); - UINumberField widthTextFiled = new UINumberField(); - widthTextFiled.setMinValue(0); - widthTextFiled.canFillNegativeNumber(false); - widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE)); - widthTextFiled.setPreferredSize(new Dimension(40, 20)); - sizeJPanel.add(widthTextFiled); + UILabel widthLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Designer_Width")); + UISpinner widthTextFiled = new UISpinner(0, Integer.MAX_VALUE, 1, DEFAULT_V_VALUE); this.setWidthTextFiled(widthTextFiled); - sizeJPanel.setVisible(true); - dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size") + ":"), sizeJPanel}); + sizePane.add(column(10, + row(4, cell(heightLabel).weight(0.15), cell(heightTextFiled).weight(0.85)), + row(4, cell(widthLabel).weight(0.15), cell(widthTextFiled).weight(0.85)) + ).getComponent()); + sizePane.setVisible(true); + dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size")), sizePane}); } private void initDialogLocationPanel(List dialogComponents) { @@ -408,13 +407,11 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane dialogComponents, List othersComponents) { // 最下方的配置面板 // 参数传递方式 - Component[] footerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type") + ":"), this.setFootPanel()}; + Component[] footerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type")), this.setFootPanel()}; dialogComponents.add(footerComponents); othersComponents.add(footerComponents); } diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java index 48affb7dc3..3f3544ddb7 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java @@ -1,6 +1,8 @@ package com.fr.design.hyperlink; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.Parameter; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.frpane.ReportletParameterViewPane; @@ -17,12 +19,14 @@ import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; import javax.swing.JOptionPane; -import java.awt.BorderLayout; -import java.awt.FlowLayout; +import javax.swing.JPanel; import java.awt.event.ActionEvent; import java.util.HashMap; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.cell; + public class ReportletHyperlinkPane extends AbstractHyperLinkPane { /** * 超链配置面板 @@ -47,23 +51,23 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane { @Override protected JPanel setHeaderPanel() { - JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + JPanel headerPane = new JPanel(new BorderLayout()); - urlTextField = new UITextField(headerPane.getWidth()); + urlTextField = new UITextField(); urlTextField.setText(ProductConstants.WEBSITE_URL); - JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlTextField, "URL:"); + UILabel urlLabel = new UILabel("URL"); + JPanel urlWithHelp = new JPanel(new BorderLayout()); + urlWithHelp.add(row( + cell(urlLabel).weight(0.13), + cell(urlTextField).weight(0.87) + ).getComponent()); if (this.needRenamePane) { - headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL)); itemNameTextField = new UITextField(); - headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH); + headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name")), BorderLayout.NORTH); headerPane.add(urlWithHelp, BorderLayout.CENTER); } else { - headerPane.add(urlWithHelp, BorderLayout.NORTH); + headerPane.add(urlWithHelp); } return headerPane; diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java index 2975e7c343..a3353b2669 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java @@ -1,5 +1,7 @@ package com.fr.design.hyperlink; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.Parameter; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.icheckbox.UICheckBox; @@ -11,12 +13,14 @@ import com.fr.js.WebHyperlink; import com.fr.stable.ParameterProvider; import javax.swing.BorderFactory; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.FlowLayout; +import javax.swing.JPanel; + import java.util.HashMap; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.cell; + public class WebHyperlinkPane extends AbstractHyperLinkPane { private static final int BORDER_WIDTH = 4; private WebHyperNorthPane northPane; @@ -35,17 +39,19 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH, BORDER_WIDTH)); + this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); northPane = new WebHyperNorthPane(needRenamePane()); - this.add(northPane, BorderLayout.NORTH); - - parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); - this.add(parameterViewPane, BorderLayout.CENTER); - parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameters"), null)); - extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters")); - this.add(GUICoreUtils.createFlowPane(new Component[]{extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH); + JPanel extendPane = new JPanel(); + extendPane.add(extendParametersCheckBox); + parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), + getValueEditorPane(), extendPane); + + this.add(column( + cell(northPane), + cell(FineUIUtils.wrapComponentWithTitle(parameterViewPane, Toolkit.i18nText("Fine-Design_Basic_Parameters"))).weight(1.0) + ).getComponent()); } @Override diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java index 848ac9e57c..9d978f3b4e 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java @@ -1,7 +1,9 @@ package com.fr.design.hyperlink.popup; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.BaseFormula; -import com.fr.base.BaseUtils; import com.fr.base.Parameter; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -10,6 +12,7 @@ import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itableeditorpane.UITableEditAction; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itree.filetree.ReportletPane; @@ -18,19 +21,26 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.module.DesignModuleFactory; import com.fr.design.parameter.ParameterReader; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.js.MobilePopupHyperlink; import com.fr.stable.CommonUtils; import com.fr.stable.FormulaProvider; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.ButtonGroup; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; +import java.awt.BorderLayout; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.cell; + public class ContentSettingPane extends AbstractHyperLinkPane { private JPanel popupTargetPane; private UIRadioButton templatePopupButton; @@ -47,7 +57,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane { private ContentSettingPane contentSettingPane; private StyleSettingPane styleSettingPane; @@ -26,9 +30,11 @@ public class MobilePopupPane extends FurtherBasicBeanPane JPanel scrollContent = new JPanel(); scrollContent.setLayout(new BorderLayout(10, 10)); contentSettingPane = new ContentSettingPane(); - scrollContent.add(contentSettingPane, BorderLayout.NORTH); styleSettingPane = new StyleSettingPane(); - scrollContent.add(styleSettingPane, BorderLayout.CENTER); + scrollContent.add(column(20, + cell(FineUIUtils.wrapComponentWithTitle(contentSettingPane, Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Content"))), + cell(FineUIUtils.wrapComponentWithTitle(styleSettingPane, Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Style"))) + ).getComponent()); contentSettingPane.addTargetRadioActionListener(radioActionListener); diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupRegularPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupRegularPane.java index 65e5085d15..bc10b89144 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupRegularPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupRegularPane.java @@ -55,7 +55,7 @@ public class MobilePopupRegularPane extends BasicPane { radiosPane.add(customRadio); radiosPane.add(autoRadio); - return MobilePopupUIUtils.createLeftTileRightContentPanel(this.label, radiosPane); + return MobilePopupUIUtils.createLeftTileRightContentPanel(this.label, radiosPane, Color.GRAY, 20); } private ActionListener radioActionListener = new ActionListener() { @@ -83,14 +83,11 @@ public class MobilePopupRegularPane extends BasicPane { JPanel spinnerLabelPane = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 5)); JPanel spinnerPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 2,0)); - Dimension dimension = new Dimension(60, 20); - spinner.setPreferredSize(dimension); UILabel percent = new UILabel("%"); spinnerPane.add(spinner); spinnerPane.add(percent); UILabel label = new UILabel(labelText); - label.setPreferredSize(dimension); label.setHorizontalAlignment(SwingConstants.CENTER); spinnerLabelPane.add(spinnerPane); diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java index cb3fbad58e..6e89fe8936 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java @@ -3,8 +3,15 @@ package com.fr.design.hyperlink.popup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.widget.UITitleSplitLine; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.JComponent; +import javax.swing.BorderFactory; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; + +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; public class MobilePopupUIUtils { static public int Line_Height = 20; @@ -12,14 +19,28 @@ public class MobilePopupUIUtils { static public int Left_Title_width = 80; static public JPanel createLeftTileRightContentPanel(String title, JComponent contentPanel) { + return createLeftTileRightContentPanel(title, contentPanel, null, 20); + } + + /** + * 创建子标题和组件行布局 + * @param title 子标题 + * @param contentPanel 组件 + * @param color 子标题颜色，默认黑色 + * @return JPanel + */ + static public JPanel createLeftTileRightContentPanel(String title, JComponent contentPanel, Color color, int space) { JPanel jp = new JPanel(); - jp.setBorder(BorderFactory.createEmptyBorder(0,0,0, 30)); - jp.setLayout(new BorderLayout(10,0)); - UILabel titleLabel = new UILabel(title + ":"); - titleLabel.setPreferredSize(new Dimension(MobilePopupUIUtils.Left_Title_width, Line_Height)); - titleLabel.setHorizontalAlignment(SwingConstants.RIGHT); - jp.add(titleLabel, BorderLayout.WEST); - jp.add(contentPanel, BorderLayout.CENTER); + jp.setLayout(new BorderLayout()); + UILabel titleLabel = new UILabel(title); + if (color != null) { + titleLabel.setForeground(color); + } + titleLabel.setForeground(color); + jp.add(row(space, + cell(titleLabel), + cell(contentPanel).weight(1.0) + ).getComponent()); return jp; } diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/StyleSettingPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/StyleSettingPane.java index 1bebe3dfc8..3073203496 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/StyleSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/StyleSettingPane.java @@ -7,15 +7,18 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.VerticalFlowLayout; import com.fr.design.style.color.NewColorSelectBox; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.js.MobilePopupHyperlink; import com.fr.stable.StringUtils; import javax.swing.*; import java.awt.*; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; + public class StyleSettingPane extends BasicBeanPane { private double maxNumber = 100; private double maxBorderRadius = 24; @@ -40,65 +43,78 @@ public class StyleSettingPane extends BasicBeanPane { } private void initComponent() { - this.setLayout(new BorderLayout(0, 10)); - this.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Style"))); + this.setLayout(new BorderLayout()); typePane = this.createTypePane(); - this.add(typePane, BorderLayout.NORTH); stylePane = this.createStylePane(); - this.add(stylePane, BorderLayout.CENTER); + this.add(column(10, + cell(typePane), + cell(stylePane) + ).getComponent()); } private JPanel createTypePane() { JPanel typePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); popupTypeLabel = new UILabel(""); - typePane.add(popupTypeLabel, BorderLayout.CENTER); - return MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Type"), typePane); + UILabel typeLabel = new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Type")); + typePane.add(row(44, + cell(typeLabel), + cell(popupTypeLabel) + ).getComponent()); + return typePane; } private JPanel createStylePane() { JPanel stylePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - stylePane.add(this.createBorderSettingPane(), BorderLayout.NORTH); - stylePane.add(this.createBackgroundSettingPane(), BorderLayout.CENTER); - stylePane.add(this.createPopupSizePane(), BorderLayout.SOUTH); + stylePane.add(column(10, + cell(this.createBorderSettingPane()), + cell(this.createBackgroundSettingPane()), + cell(this.createPopupSizePane()) + ).getComponent()); return stylePane; } private JPanel createBorderSettingPane() { JPanel borderPane = new JPanel(); - VerticalFlowLayout layout = new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 10); - layout.setAlignLeft(true); - borderPane.setLayout(layout); + borderPane.setLayout(new BorderLayout()); borderType = new LineComboBox(MobilePopupConstants.BORDER_LINE_STYLE_ARRAY); - borderType.setPreferredSize(new Dimension(115, 20)); - borderPane.add(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Line"), borderType)); borderColor = new NewColorSelectBox(100); - borderPane.add(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Colors"), borderColor)); borderRadiusSpinner = new UISpinner(0, maxBorderRadius, 1, 20); - borderRadiusSpinner.setPreferredSize(new Dimension(120, 20)); - borderPane.add(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Radius"), borderRadiusSpinner)); - return MobilePopupUIUtils.createTitleSplitLineContentPane(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Border"), borderPane); + UILabel borderLabel = new UILabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Border")); + borderPane.add(row(44, + column(10, + cell(borderLabel).weight(0.3), + flex().weight(0.7)), + column(10, + cell(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Line"), borderType, Color.GRAY, 64)), + cell(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Colors"), borderColor, Color.GRAY, 64)), + cell(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Radius"), borderRadiusSpinner, Color.GRAY, 64))) + ).getComponent()); + return borderPane; } private JPanel createBackgroundSettingPane() { JPanel bgPane = new JPanel(); - VerticalFlowLayout layout = new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 10); - layout.setAlignLeft(true); - bgPane.setLayout(layout); + bgPane.setLayout(new BorderLayout()); - JPanel colorPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0,0)); bgColor = new NewColorSelectBox(100); - colorPane.add(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Colors"), bgColor)); - bgPane.add(colorPane); JPanel transparencyPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.numberDragPane = new UINumberDragPane(0,100); - this.numberDragPane.setPreferredSize(new Dimension(140, 20)); transparencyPane.add(numberDragPane, BorderLayout.CENTER); transparencyPane.add(new UILabel(" %"), BorderLayout.EAST); - bgPane.add(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Opacity"), transparencyPane)); - return MobilePopupUIUtils.createTitleSplitLineContentPane(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Background"), bgPane); + JLabel bgLabel = new JLabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Background")); + bgPane.add(row(44, + column(10, + cell(bgLabel).weight(0.6), + flex().weight(0.4)), + column(10, + cell(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Colors"), bgColor, Color.GRAY, 64)), + cell(MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Opacity"), transparencyPane, Color.GRAY, 64)) + ) + ).getComponent()); + return bgPane; } private JPanel createPopupSizePane() { @@ -107,10 +123,17 @@ public class StyleSettingPane extends BasicBeanPane { mobileRegularPane = new MobilePopupRegularPane(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Mobile_Rules")); padRegularPane = new MobilePopupRegularPane(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Pad_Rules")); - sizePane.add(mobileRegularPane, BorderLayout.NORTH); - sizePane.add(padRegularPane, BorderLayout.CENTER); - - return MobilePopupUIUtils.createTitleSplitLineContentPane(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Size"), sizePane); + JLabel sizeLabel = new JLabel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Size")); + sizePane.add(row(20, + column(10, + cell(sizeLabel).weight(0.16), + flex().weight(0.84)), + column(10, + cell(mobileRegularPane), + cell(padRegularPane) + ) + ).getComponent()); + return sizePane; } @Override diff --git a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java index 7d57708642..3bd65fd7ae 100644 --- a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java +++ b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java @@ -1,6 +1,5 @@ package com.fr.design.i18n; -import com.fr.design.DesignerEnvManager; import com.fr.general.GeneralContext; import com.fr.general.log.MessageFormatter; import com.fr.locale.DesignI18nProvider; @@ -15,10 +14,10 @@ import java.util.Locale; public class DesignI18nImpl implements DesignI18nProvider { - static { - // GeneralContext上下文 存储本次启动的语言环境 直接使用DesignerEnvManager 会在设置语言环境后 不重启 立即生效 存在问题 - GeneralContext.setLocale(DesignerEnvManager.getEnvManager().getLanguage()); - } +// static { +// // GeneralContext上下文 存储本次启动的语言环境 直接使用DesignerEnvManager 会在设置语言环境后 不重启 立即生效 存在问题 +// GeneralContext.setLocale(DesignerEnvManager.getEnvManager().getLanguage()); +// } private static DesignI18nImpl instance = new DesignI18nImpl(); diff --git a/designer-base/src/main/java/com/fr/design/icon/BorderIcon.java b/designer-base/src/main/java/com/fr/design/icon/BorderIcon.java index 8250cd7022..4e034ba963 100644 --- a/designer-base/src/main/java/com/fr/design/icon/BorderIcon.java +++ b/designer-base/src/main/java/com/fr/design/icon/BorderIcon.java @@ -1,22 +1,21 @@ package com.fr.design.icon; +import com.fine.theme.utils.FineUIScale; +import com.fr.base.CellBorderStyle; +import com.fr.base.GraphHelper; import com.fr.stable.AssistUtils; +import com.fr.stable.Constants; + +import javax.swing.Icon; import java.awt.Color; import java.awt.Component; import java.awt.Graphics; import java.awt.Graphics2D; -import javax.swing.Icon; - -import com.fr.base.CellBorderStyle; -import com.fr.base.GraphHelper; -import com.fr.design.constants.UIConstants; -import com.fr.stable.Constants; - public class BorderIcon implements Icon { - private int width = 14; - private int height = 14; + private int width = FineUIScale.scale(16); + private int height = FineUIScale.scale(16); public CellBorderStyle cellBorderStyle; public BorderIcon(CellBorderStyle cellBorderStyle) { @@ -37,10 +36,6 @@ public class BorderIcon implements Icon { private void drawLine(Graphics g, double x1, double y1, double x2, double y2, int lineStyle, Color color) { g.setColor(color); - x1--; - x2--; - y1--; - y2--; if (lineStyle == Constants.LINE_MEDIUM || lineStyle == Constants.LINE_THICK) { lineStyle = Constants.LINE_MEDIUM; @@ -57,7 +52,8 @@ public class BorderIcon implements Icon { || lineStyle == Constants.LINE_DOUBLE) { GraphHelper.drawLine(g, x1, y1, x2, y2, lineStyle); } else { - lineStyle = Constants.LINE_DOT; + lineStyle = Constants.LINE_THIN; + g.setColor(new Color(185, 189, 196)); if (AssistUtils.equals(y1, x2) && AssistUtils.equals(x2, y2)) { GraphHelper.drawLine(g, x1, y1, x2 + 1, y2, lineStyle); } else { @@ -70,13 +66,11 @@ public class BorderIcon implements Icon { public void paintIcon(Component c, Graphics g, int x, int y) { int defaultWidth = c.getWidth(); int defaultHeight = c.getHeight(); - int x1 = (defaultWidth - width) / 2; - int x2 = (defaultWidth + width) / 2; - int y1 = (defaultHeight - height) / 2; - int y2 = (defaultHeight + height) / 2; + int x1 = (defaultWidth - width) / 2 + 1; + int x2 = (defaultWidth + width) / 2 - 1; + int y1 = (defaultHeight - height) / 2 + 1; + int y2 = (defaultHeight + height) / 2 - 1; Graphics2D gr = (Graphics2D) g; - gr.setColor(UIConstants.NORMAL_BACKGROUND); - gr.fillRect(x1, y1, width, height); drawLine(gr, x1, y1, x2, y1, cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor()); drawLine(gr, x2, y1, x2, y2, cellBorderStyle.getRightStyle(), diff --git a/designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java index e5100b54b3..a475fa1cdb 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java @@ -1,8 +1,10 @@ package com.fr.design.javascript; +import com.fine.theme.utils.FineUIScale; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.CommitTabbedPane; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.write.submit.DBManipulationPane; import com.fr.js.Commit2DBJavaScript; @@ -15,6 +17,9 @@ import java.awt.Dimension; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; + public class Commit2DBJavaScriptPane extends FurtherBasicBeanPane { private List dbmPaneList = new ArrayList(); private CommitTabbedPane commitTabbedPane; @@ -50,13 +55,18 @@ public class Commit2DBJavaScriptPane extends FurtherBasicBeanPane { @@ -37,12 +50,12 @@ public class EmailPane extends FurtherBasicBeanPane { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 10)); tipsPane1 = new UILabel(); - tipsPane1.setHorizontalAlignment(SwingConstants.RIGHT); - tipsPane1.setForeground(Color.pink); + tipsPane1.setHorizontalAlignment(SwingConstants.LEFT); + FineUIStyle.setStyle(tipsPane1, FineUIStyle.LABEL_WARNING_TIP); tipsPane2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Tips")); - UILabel mainTextLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Content") + ":"); - mainTextLabel.setHorizontalAlignment(SwingConstants.RIGHT); + UILabel mainTextLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Content")); + mainTextLabel.setHorizontalAlignment(SwingConstants.LEFT); mainTextLabel.setVerticalAlignment(SwingConstants.TOP); JScrollPane scrollPane = new JScrollPane(mainTextEditor = new JTextArea()); scrollPane.setBorder(null); @@ -62,21 +75,23 @@ public class EmailPane extends FurtherBasicBeanPane { double[] rowSize = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred, preferred }; double[] columnSize = { preferred, fill}; showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content")); - centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ - {new UILabel(), tipsPane1}, - createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Bcc"), bccEditor = new UITextField()), - createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Subject"), titleEditor = new UITextField()), - {mainTextLabel, scrollPane}, - {new UILabel(), showTplContent}, - {new UILabel(), tipsPane2}},rowSize, columnSize, 8); + + centerPane = new JPanel(new BorderLayout()); + centerPane.add(column(10, + row(cell(tipsPane1), cell(new UILabel())), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"))).weight(0.1), flex(0.04), cell(maitoEditor = new UITextField()).weight(0.86)), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"))).weight(0.1), flex(0.04), cell(ccEditor = new UITextField()).weight(0.86)), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Bcc"))).weight(0.1), flex(0.04), cell(bccEditor = new UITextField()).weight(0.86)), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Subject"))).weight(0.1), flex(0.04), cell(titleEditor = new UITextField()).weight(0.86)), + row(cell(mainTextLabel).weight(0.1), flex(0.04), cell(scrollPane).weight(0.86)).weight(1.0), + row(cell(new UILabel()).weight(0.1), flex(0.04), cell(showTplContent).weight(0.86)), + row(cell(new UILabel()).weight(0.14), cell(tipsPane2).weight(0.86)) + ).getComponent()); } protected JComponent[] createLinePane(String string, JTextComponent textComp) { - UILabel label = new UILabel(string + ":"); - label.setPreferredSize(new Dimension(70, label.getPreferredSize().height)); - label.setHorizontalAlignment(SwingConstants.RIGHT); + UILabel label = new UILabel(string); + label.setHorizontalAlignment(SwingConstants.LEFT); return new JComponent[] { label, textComp }; } diff --git a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java index 6c2e46e985..67f63e8acb 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java @@ -1,9 +1,10 @@ package com.fr.design.javascript; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseFormula; import com.fr.base.Parameter; import com.fr.base.extension.FileExtension; -import com.fr.design.border.UITitledBorder; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; @@ -35,9 +36,12 @@ import com.fr.js.SingleJavaScript; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.CardLayout; +import java.awt.Component; import javax.swing.AbstractButton; import javax.swing.AbstractCellEditor; -import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; import javax.swing.JList; @@ -51,9 +55,6 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import java.awt.BorderLayout; -import java.awt.CardLayout; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -67,6 +68,13 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.theme.utils.FineUIScale.scale; +import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle; + public class ExportJavaScriptPane extends AbstractHyperLinkPane { private ExportRadioGroup templateRadioGroup; @@ -114,31 +122,22 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane(new ExportJSTableModel()); editorPane.setHeaderResizing(false); - - this.add(editorPane, BorderLayout.CENTER); + editorPane.setPreferredSize(scale(new Dimension(-1,300))); + this.add(wrapComponentWithTitle(editorPane, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Other"))); } public void reset() { @@ -318,9 +302,9 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane { } protected void initLayout() { - this.setLayout(new BorderLayout(0, 6)); + this.setLayout(new BorderLayout(0, FineUIScale.scale(10))); JPanel northPane = new JPanel(new BorderLayout()); - northPane.setBorder(BorderFactory.createEmptyBorder(3, 10, 0, 10)); this.add(northPane, BorderLayout.NORTH); northPane.add(jcb, BorderLayout.CENTER); this.add(cardPane, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index 37bca2f6eb..1efd313940 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -1,5 +1,6 @@ package com.fr.design.javascript; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.Parameter; import com.fr.design.data.tabledata.tabledatapane.OneListTableModel; import com.fr.design.dialog.FineJOptionPane; @@ -25,11 +26,14 @@ import javax.swing.event.TableModelListener; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.GridBagConstraints; -import java.awt.GridLayout; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; + public class JavaScriptImplPane extends AbstractHyperLinkPane { private static final int BOTTOM_BORDER = 12; private UITextField itemNameTextField; @@ -64,21 +68,20 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { protected void initComponents() { parameterPane = createParameterViewPane(); importedJsPane = createImportedJsPane(); - importedJsPane.setPreferredSize(new Dimension(265, 150)); jsPane = createJSContentPane(defaultArgs); - jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"))); - - parameterPane.setPreferredSize(new Dimension(265, 150)); - JPanel topPane = new JPanel(new GridLayout(1,2)); - topPane.add(importedJsPane); - topPane.add(parameterPane); - topPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM_BORDER, 0)); + JPanel topPane = new JPanel(new BorderLayout()); + topPane.add(row(10, + cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5), + cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5) + ).getComponent()); this.setLayout(new BorderLayout()); - this.add(topPane, BorderLayout.NORTH); - this.add(jsPane, BorderLayout.CENTER); + this.add(column(10, + cell(topPane).weight(0.5), + cell(FineUIUtils.wrapComponentWithTitle(jsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"))).weight(0.5) + ).getComponent()); this.reLayoutForChart(); } @@ -106,7 +109,6 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { protected ReportletParameterViewPane createParameterViewPane(){ ReportletParameterViewPane parameterPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); - parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))); parameterPane.addTableEditorListener(new TableModelListener() { public void tableChanged(TableModelEvent e) { List list = parameterPane.update(); @@ -142,7 +144,6 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } }; UITableEditorPane importedJsPane = new UITableEditorPane(model); - importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))); return importedJsPane; } diff --git a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java index 417533465d..2fb1a7d4fd 100644 --- a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java @@ -1,5 +1,6 @@ package com.fr.design.layout; +import com.fine.theme.utils.FineUIScale; import com.fr.design.border.UITitledBorder; import com.fr.design.gui.ilable.UILabel; import com.fr.stable.AssistUtils; @@ -114,6 +115,16 @@ public class FRGUIPaneFactory { return new BorderLayout(); } + /** + * 创建一个适应 DPI 缩放的边框布局 + * @param hgap 水平间距 + * @param vgap 竖直间距 + * @return JPanel对象 + */ + public static LayoutManager createScaledBorderLayout(int hgap, int vgap) { + return new BorderLayout(FineUIScale.scale(hgap), FineUIScale.scale(vgap)); + } + /** * 创建一个边框布局，间距4,4 * @@ -149,7 +160,7 @@ public class FRGUIPaneFactory { * @return FRGridLayout对象 */ public static LayoutManager createNColumnGridLayout(int nColumn) { - return new FRGridLayout(nColumn); + return new FRGridLayout(nColumn, 4, 2); } public static LayoutManager createCenterLayout(JComponent centerBody) { @@ -660,6 +671,17 @@ public class FRGUIPaneFactory { return jp; } + /** + * 创建包含水平垂直间距的边框面板S + * + * @return JPanel对象 + */ + public static JPanel createScaledBorderLayout_S_Pane(int hgap, int vgap) { + JPanel jp = new JPanel(); + jp.setLayout(FRGUIPaneFactory.createScaledBorderLayout(hgap, vgap)); + return jp; + } + public static JPanel createBorderLayout_NO_Opaque_Pane() { JPanel jp = new JPanel(); jp.setOpaque(false); diff --git a/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java b/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java index e664524026..5e31ba2f7f 100644 --- a/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java +++ b/designer-base/src/main/java/com/fr/design/layout/TableLayoutHelper.java @@ -1,16 +1,13 @@ package com.fr.design.layout; - +import com.fine.theme.utils.FineUIScale; import com.fr.design.constants.LayoutConstants; -import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; -import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.stable.StringUtils; - -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import java.awt.Component; +import java.awt.Container; public class TableLayoutHelper { @@ -18,8 +15,6 @@ public class TableLayoutHelper { public static final int FILL_LASTCOLUMN = 1; public static final int FILL_LASTROW = 2; public static final int FILL_LASTCOL_AND_ROW = 3; - private static final int FIVE = 5; - private static final int TEN = 10; private TableLayoutHelper() { } @@ -287,6 +282,8 @@ public class TableLayoutHelper { layoutRowSize[i * 2 + 1] = rowSize[i]; } + scaleIfNeed(layoutRowSize, layoutColumnSize); + layoutSize[0] = layoutColumnSize; layoutSize[1] = layoutRowSize; @@ -296,6 +293,28 @@ public class TableLayoutHelper { return resultPane; } + /** + * 缩放必要的尺寸。 + * 尺寸参数有三种，小于0有三种预定义类型，0~1之间为比例参数，大于等于1为普通px。 + * 这里只对px进行缩放处理 + * 注意：当前只对从TableLayoutHelper创建的TableLayout进行尺寸缩放。 + */ + private static void scaleIfNeed(double[] layoutRowSize, double[] layoutColumnSize) { + for (int i = 0; i < layoutRowSize.length; i++) { + double size = layoutRowSize[i]; + if (size >= 1.0) { + layoutRowSize[i] = FineUIScale.scale((float) size); + } + } + + for (int i = 0; i < layoutColumnSize.length; i++) { + double size = layoutColumnSize[i]; + if (size >= 1.0) { + layoutColumnSize[i] = FineUIScale.scale((float) size); + } + } + } + /** * 创建具有不同垂直间距的TableLayout面板 * @@ -363,73 +382,4 @@ public class TableLayoutHelper { }; return createTableLayoutPane(comp, row, column); } - - public static void main(String[] args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - JPanel content = (JPanel) jf.getContentPane(); - content.setLayout(new GridLayout(2, 3)); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - JPanel jp1 = TableLayoutHelper.createTableLayoutPane(createTestComponents("jp1"), TableLayoutHelper.FILL_NONE); - JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp2"), - TableLayoutHelper.FILL_LASTCOL_AND_ROW, (double)2 * TEN, (double)2 * TEN); - JPanel jp3 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp3"), - new double[]{f, p, f, p}, new double[]{f, f}, 4, 4); - JPanel jp4 = TableLayoutHelper.createGapTableLayoutPane(createTestComponents("jp4"), - new double[]{p, FIVE * TEN, p, p, p, p}, new double[]{p, f}, new int[][]{{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, 1, FIVE); - - JPanel jp5 = TableLayoutHelper.createDiffVGapTableLayoutPane(createTestComponents("jp5"), - new double[]{p, p, p, p, p}, new double[]{p, f}, 4, new double[]{4, 8, 14, 4}); - JPanel jp6 = new JPanel(); - jp1.setBorder(BorderFactory.createLineBorder(Color.red)); - jp2.setBorder(BorderFactory.createLineBorder(Color.red)); - jp3.setBorder(BorderFactory.createLineBorder(Color.red)); - jp4.setBorder(BorderFactory.createLineBorder(Color.red)); - jp5.setBorder(BorderFactory.createLineBorder(Color.red)); - jp6.setBorder(BorderFactory.createLineBorder(Color.red)); - - - content.add(jp1); - content.add(jp2); - content.add(jp3); - content.add(jp4); - content.add(jp5); - content.add(jp6); - - GUICoreUtils.centerWindow(jf); - jf.setSize(900, 600); - jf.setVisible(true); - } - - private static Component[][] createTestComponents(String name) { - UILabel label1 = new UILabel(name + "laaaable1"); - UILabel label2 = new UILabel(name + "lable2"); - UILabel label3 = new UILabel(name + "lable3"); - UILabel label4 = new UILabel(name + "lable4"); - UILabel label5 = new UILabel(name + "lable5"); - UIButton button1 = new UIButton(name + "button1"); - UIButton button2 = new UIButton(name + "button2"); - label1.setSize(label1.getPreferredSize()); - label1.setBorder(BorderFactory.createLineBorder(Color.blue)); - label2.setSize(label2.getPreferredSize()); - label2.setBorder(BorderFactory.createLineBorder(Color.blue)); - label3.setSize(label3.getPreferredSize()); - label3.setBorder(BorderFactory.createLineBorder(Color.blue)); - label4.setSize(label4.getPreferredSize()); - label4.setBorder(BorderFactory.createLineBorder(Color.blue)); - label5.setSize(label5.getPreferredSize()); - label5.setBorder(BorderFactory.createLineBorder(Color.blue)); - button1.setSize(button1.getPreferredSize()); - button2.setSize(button2.getPreferredSize()); - button1.setBackground(Color.darkGray); - button2.setBackground(Color.darkGray); - return new Component[][]{ - new Component[]{label1, button1}, - new Component[]{label2, null}, - new Component[]{label3}, - new Component[]{null, label4}, - new Component[]{button2, label5} - }; - } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java index 3cceff5a75..0a802a5d7f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java @@ -1,14 +1,14 @@ package com.fr.design.mainframe; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.DesignState; import com.fr.design.base.mode.DesignModeContext; -import com.fr.design.constants.UIConstants; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.MultiTemplateTabPane; -import com.fr.design.file.NewTemplatePane; import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.imenu.UIMenuHighLight; -import com.fr.design.gui.itoolbar.UILargeToolbar; +import com.fr.design.gui.ibutton.UICombinationButton; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; @@ -17,16 +17,20 @@ import org.jetbrains.annotations.Nullable; import javax.swing.JComponent; import javax.swing.JPanel; -import javax.swing.border.MatteBorder; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.Insets; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import static com.fine.theme.utils.FineUIScale.scale; +import static com.fine.theme.utils.FineUIStyle.NORMAL_COLOR; +import static com.fine.theme.utils.FineUIStyle.TOP_TOOLS; +import static com.fine.theme.utils.FineUIStyle.setStyle; + /** * @author shine @@ -46,14 +50,13 @@ public class CenterRegionContainerPane extends JPanel { private JComponent toolbarComponent;//cpt 字体 等工具栏 private JPanel eastPane;//=largeToolbar+eastCenterPane - private UILargeToolbar largeToolbar;//预览 + private UICombinationButton largeToolbar;//预览 private JPanel eastCenterPane;//=combineUp + templateTabPane private UIToolbar combineUp;//撤销重做 等工具栏 - private JPanel templateTabPane;//新建模板 + 模板tab标签 - private NewTemplatePane newWorkBookPane;//新建模板button + private MultiTemplateTabPane templateTabPane;//新建模板 + 模板tab标签 public static CenterRegionContainerPane getInstance() { @@ -69,35 +72,34 @@ public class CenterRegionContainerPane extends JPanel { public CenterRegionContainerPane() { - toolbarPane = new JPanel() { - - @Override - public Dimension getPreferredSize() { - - Dimension dim = super.getPreferredSize(); - // dim.height = TOOLBAR_HEIGHT; - return dim; - } - }; + toolbarPane = new JPanel(); + toolbarPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); toolbarPane.setLayout(FRGUIPaneFactory.createBorderLayout()); eastPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - eastPane.add(largeToolbar = getToolBarMenuDock().createLargeToolbar(), BorderLayout.WEST); + largeToolbar = getToolBarMenuDock().createLargeToolbar(); eastCenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); combineUpTooBar(); - eastCenterPane.add(combineUp, BorderLayout.NORTH); - templateTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - templateTabPane.add(newWorkBookPane = getToolBarMenuDock().getNewTemplatePane(), BorderLayout.WEST); - templateTabPane.add(MultiTemplateTabPane.getInstance(), BorderLayout.CENTER); - eastCenterPane.add(templateTabPane, BorderLayout.CENTER); + templateTabPane = initTemplateTabPane(); + eastCenterPane.add(templateTabPane, BorderLayout.NORTH); + eastCenterPane.add(combineUp, BorderLayout.CENTER); eastPane.add(eastCenterPane, BorderLayout.CENTER); toolbarPane.add(eastPane, BorderLayout.NORTH); - toolbarPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); + + Color tabPaneColor = FineUIUtils.getUIColor("TemplateTabPane.background", "fill.gray"); + toolbarPane.setBackground(tabPaneColor); + eastCenterPane.setBackground(tabPaneColor); this.setLayout(new BorderLayout()); this.add(centerTemplateCardPane = new DesktopCardPane(), BorderLayout.CENTER); + centerTemplateCardPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); this.add(toolbarPane, BorderLayout.NORTH); + setStyle(this, NORMAL_COLOR); + } + private MultiTemplateTabPane initTemplateTabPane() { + MultiTemplateTabPane templateTabPane = MultiTemplateTabPane.getInstance(); + return templateTabPane; } public ToolBarMenuDock getToolBarMenuDock() { @@ -109,10 +111,10 @@ public class CenterRegionContainerPane extends JPanel { */ private void combineUpTooBar() { combineUp = new UIToolbar(FlowLayout.LEFT); - combineUp.setBorder(new MatteBorder(new Insets(0, LEFT_ALIGN_GAP, 1, 0), UIConstants.LINE_COLOR)); - combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 2)); + setStyle(combineUp, TOP_TOOLS); + combineUp.setBorder(new ScaledEmptyBorder(10, 5, 10, 10)); + combineUp.setLayout(new FlowLayout(FlowLayout.LEFT, scale(5), 0)); setUpUpToolBar(null); - } @@ -125,6 +127,13 @@ public class CenterRegionContainerPane extends JPanel { plus.insertToCombineUpToolbar(combineUp); } + /** + * 重置多工作簿面板 + */ + private void resetMultiTemplateTablePane() { + MultiTemplateTabPane.getInstance().resetMultiTemplateTabPane(); + } + /** * 填充上工具栏的中的工具 @@ -132,6 +141,7 @@ public class CenterRegionContainerPane extends JPanel { * @param toolbar4Form 目标组件 */ private void setUpUpToolBar(@Nullable JComponent[] toolbar4Form) { + combineUp.add(largeToolbar); UIButton[] fixButtons = getToolBarMenuDock().createUp(); for (UIButton fixButton : fixButtons) { combineUp.add(fixButton); @@ -222,6 +232,7 @@ public class CenterRegionContainerPane extends JPanel { */ protected void resetToolkitByPlus(ToolBarMenuDockPlus plus, ToolBarMenuDock ad, ToolKitConfigStrategy strategy) { + resetMultiTemplateTablePane(); resetCombineUpTooBar(ad.resetUpToolBar(plus), plus); if (toolbarComponent != null) { @@ -230,29 +241,26 @@ public class CenterRegionContainerPane extends JPanel { // 颜色，字体那些按钮的工具栏 toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BorderLayout.CENTER); - JPanel customNorthPane = strategy.customNorthPane(toolbarPane,plus); - if (!isExist(customNorthPane)){ + setStyle(toolbarComponent, TOP_TOOLS); + toolbarComponent.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + toolbarComponent.setBorder(new ScaledEmptyBorder(0, 5, 0, 10)); + JPanel customNorthPane = strategy.customNorthPane(toolbarPane, plus); + if (!isExist(customNorthPane)) { this.removeNorth(); this.add(customNorthPane, BorderLayout.NORTH); } - if (strategy.hasTemplateTabPane(plus)) { - eastCenterPane.add(templateTabPane, BorderLayout.CENTER); - } else { - eastCenterPane.remove(templateTabPane); - } if (strategy.hasCombineUp(plus)) { - eastCenterPane.add(combineUp, BorderLayout.NORTH); + eastCenterPane.add(combineUp, BorderLayout.CENTER); } else { eastCenterPane.remove(combineUp); } - resetByDesignMode(); } - private void removeNorth(){ + private void removeNorth() { Component[] components = this.getComponents(); - for(Component c : components){ - if (c!= centerTemplateCardPane){ + for (Component c : components) { + if (c != centerTemplateCardPane) { this.remove(c); } } @@ -269,19 +277,6 @@ public class CenterRegionContainerPane extends JPanel { return false; } - private void resetByDesignMode() { - if (DesignModeContext.isDuchampMode()) { - eastPane.remove(largeToolbar); - //移除新建模板按钮 - templateTabPane.remove(newWorkBookPane); - } else { - eastPane.add(largeToolbar, BorderLayout.WEST); - templateTabPane.add(newWorkBookPane, BorderLayout.WEST); - - } - } - - JComponent getToolbarComponent() { @@ -292,8 +287,7 @@ public class CenterRegionContainerPane extends JPanel { * 判断是否在权限编辑状态，若是在权限编辑状态，则需要有虚线框和关闭突变 */ protected void needToAddAuhtorityPaint() { - newWorkBookPane.setButtonGray(DesignModeContext.isAuthorityEditing()); - + MultiTemplateTabPane.getInstance().setToolBarEnable(DesignModeContext.isAuthorityEditing()); } @@ -314,8 +308,8 @@ public class CenterRegionContainerPane extends JPanel { /** * 重置下RegionContainerpane */ - public void resetCenterRegionContainerPane(){ - templateTabPane.add(MultiTemplateTabPane.getInstance(), BorderLayout.CENTER); + public void resetCenterRegionContainerPane() { + } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java index f5f415fa6d..fc6be544d2 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java @@ -11,6 +11,7 @@ import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.core.ActionFactory; import com.fr.design.base.mode.DesignModeContext; import com.fr.design.base.mode.DesignerMode; +import com.fr.design.carton.latency.DesignerLatencyMetric; import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.TableDataTreePane; @@ -619,7 +620,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta this.ad.updateToolBarDef(); } - ToolBarMenuDock getToolBarMenuDock() { + public ToolBarMenuDock getToolBarMenuDock() { return this.ad; } @@ -1161,6 +1162,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta }); DesignerEnvManager.getEnvManager().saveXMLFile(); + DesignerLatencyMetric.getInstance().stop(); } /** diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 1a715fefa0..31259ffbda 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.base.extension.FileExtension; import com.fr.base.vcs.DesignerMode; @@ -16,7 +17,6 @@ import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager; import com.fr.design.data.tabledata.ResponseDataSourceChange; -import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.file.FileOperations; import com.fr.design.file.FileToolbarStateChangeListener; @@ -26,7 +26,6 @@ import com.fr.design.file.MultiTemplateTabPane; import com.fr.design.file.TemplateTreePane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.imenu.UIMenuHighLight; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.i18n.Toolkit; @@ -170,18 +169,15 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt setLayout(new BorderLayout()); toolBar = ToolBarDef.createJToolBar(); - toolBar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.TOOLBAR_BORDER_COLOR)); toolBar.setBorderPainted(true); JPanel tooBarPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel parent = new JPanel(new BorderLayout()); parent.add(createUpToolBarPane(), BorderLayout.CENTER); parent.setBorder(BorderFactory.createEmptyBorder(3, 0, 4, 0)); tooBarPane.add(parent, BorderLayout.CENTER); - tooBarPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); searchToolbarPane = new TemplateTreeSearchToolbarPane(toolBar); searchToolbarPane.add(createUpToolBarPane(), BorderLayout.EAST); - searchToolbarPane.setPreferredSize(new Dimension(this.getWidth(), 23)); add(searchToolbarPane, BorderLayout.NORTH); CardLayout card; JPanel cardPane = new JPanel(card = new CardLayout()); @@ -331,7 +327,6 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt */ private void addVcsAction(ToolBarDef toolbarDef) { if (VcsHelper.getInstance().needInit()) { - vcsAction = new VcsAction(); if (!isLegacyOnCluster()) { vcsAction.setName(Toolkit.i18nText("Fine-Design_Vcs_Title")); @@ -341,7 +336,6 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt toolbarDef.addShortCut(vcsAction); //11.0.19及其之后加入回收站逻辑 if (VcsHelper.getInstance().checkV2FunctionSupport()) { - recycleAction = new RecycleAction(); toolbarDef.addShortCut(recycleAction); } } @@ -433,7 +427,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt public NewFolderAction() { this.setName(KeySetUtils.NEW_FOLDER.getMenuKeySetName()); - this.setSmallIcon("/com/fr/design/standard/newfolder/new_folder"); + this.setSmallIcon(new LazyIcon("new_folder")); } @Override @@ -458,7 +452,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt public SwitchAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Search")); this.setMnemonic('S'); - this.setSmallIcon("/com/fr/design/standard/search", false); + this.setSmallIcon(new LazyIcon("search")); } @Override @@ -475,7 +469,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt public CollapseAllAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Collapse_All")); - this.setSmallIcon("/com/fr/design/standard/collapse_all", false); + this.setSmallIcon(new LazyIcon("collapse_all")); } @Override @@ -491,7 +485,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt private class VcsAction extends UpdateAction { public VcsAction() { - this.setSmallIcon("/com/fr/design/standard/vcslist/vcs_list"); + this.setSmallIcon(new LazyIcon("vcs_list")); } @Override @@ -574,7 +568,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt public ShowInExplorerAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_In_Containing_Folder")); - this.setSmallIcon("/com/fr/design/standard/viewfolder/view_folder"); + this.setSmallIcon(new LazyIcon("view_folder")); } @Override @@ -591,7 +585,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt public RefreshTreeAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Refresh")); - this.setSmallIcon("/com/fr/design/standard/refresh", false); + this.setSmallIcon(new LazyIcon("refresh")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java index cd99f728a2..99e7d0335b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java @@ -9,13 +9,18 @@ import com.fr.general.ComparatorUtils; */ public class DesignerUIModeConfig { private DesignerUIMode mode = AbsoluteMeasureUIMode.getInstance(); + private boolean uiDevMode = false; private static class DesignerUIModeConfigHolder { private static final DesignerUIModeConfig designerUIModeConfig = new DesignerUIModeConfig(); } private DesignerUIModeConfig() { + init(); + } + private void init() { + uiDevMode = Boolean.parseBoolean(System.getProperty("uiDevMode", "false")); } public static DesignerUIModeConfig getInstance() { @@ -32,6 +37,15 @@ public class DesignerUIModeConfig { return ComparatorUtils.equals(SimulateWebUIMode.getInstance(), mode); } + /** + * 判断是否是ui开发者模式 + * + * @return boolean + */ + public boolean isUIDevMode() { + return uiDevMode; + } + /** * 设置新ui模式 */ diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java index 9757b0f0b5..02fa561416 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java @@ -54,6 +54,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener protected DesktopCardPane() { setLayout(new BorderLayout()); + setOpaque(false); layeredPane.add(transparentPane, TRANSPARENT_LAYER); layeredPane.add(failedPane, FAILED_LAYER); layeredPane.add(forbiddenPane, FORBIDDEN_LAYER); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DottedLine.java b/designer-base/src/main/java/com/fr/design/mainframe/DottedLine.java index 9382b03f89..4e37a87830 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DottedLine.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DottedLine.java @@ -1 +1 @@ -package com.fr.design.mainframe; import com.fr.design.constants.UIConstants; import com.fr.design.gui.iscrollbar.UIScrollBar; import javax.swing.*; import java.awt.*; import java.awt.geom.GeneralPath; import java.awt.geom.Path2D; /** * Author : daisy * Date: 13-9-11 * Time: 上午10:14 */ public class DottedLine extends JPanel { public static final int HEIGHT = 3; private static final int BLUE_WIDTH = 12;//蓝色线长度，白色线长度是其半 private int direction = UIScrollBar.HORIZONTAL; public DottedLine(int direction, int width) { //水平方向的虚线框 if (direction == UIScrollBar.HORIZONTAL) { this.setPreferredSize(new Dimension(width, HEIGHT)); } else { this.setPreferredSize(new Dimension(HEIGHT, width)); } this.direction = direction; this.setBackground(new Color(255, 255, 255));//设置白色背景 } public void paint(Graphics g) { Graphics2D g2d = (Graphics2D) g; //如果是水平方向的 if (direction == UIScrollBar.HORIZONTAL) { paintHorizontal(g2d); } else { paintVertical(g2d); } } private void paintHorizontal(Graphics2D g2d) { int totalWidth = getWidth(); int paintX = 0; while (paintX < totalWidth) { int endX = paintX + BLUE_WIDTH; if (endX > totalWidth) { endX = totalWidth; } int[] x = new int[]{paintX, endX, endX, paintX, paintX}; int[] y = new int[]{0, 0, HEIGHT, HEIGHT, 0}; paintBlueArea(g2d, x, y); paintX += BLUE_WIDTH + BLUE_WIDTH / 2; } } private void paintVertical(Graphics2D g2d) { int totalHeight = getHeight(); int paintY = 0; while (paintY < totalHeight) { int endY = paintY + BLUE_WIDTH; if (endY > totalHeight) { endY = totalHeight; } int[] x = new int[]{0, HEIGHT, HEIGHT, 0, 0}; int[] y = new int[]{paintY, paintY, endY, endY, paintY}; paintBlueArea(g2d, x, y); paintY += BLUE_WIDTH + BLUE_WIDTH / 2; } } private void paintBlueArea(Graphics2D g2d, int[] x, int[] y) { g2d.setPaint(UIConstants.DOTTED_LINE_COLOR); GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length); generalPath.moveTo(x[0], y[0]); for (int index = 1; index < x.length; index++) { generalPath.lineTo(x[index], y[index]); } generalPath.closePath(); g2d.fill(generalPath); } } \ No newline at end of file +package com.fr.design.mainframe; import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.constants.UIConstants; import com.fr.design.gui.iscrollbar.UIScrollBar; import javax.swing.*; import java.awt.*; import java.awt.geom.GeneralPath; import java.awt.geom.Path2D; /** * Author : daisy * Date: 13-9-11 * Time: 上午10:14 */ public class DottedLine extends JPanel { public static final int HEIGHT = 3; private static final int BLUE_WIDTH = 12;//蓝色线长度，白色线长度是其半 private int direction = UIScrollBar.HORIZONTAL; public DottedLine(int direction, int width) { //水平方向的虚线框 if (direction == UIScrollBar.HORIZONTAL) { this.setPreferredSize(new Dimension(width, HEIGHT)); } else { this.setPreferredSize(new Dimension(HEIGHT, width)); } this.direction = direction; this.setBackground(new Color(255, 255, 255));//设置白色背景 } public void paint(Graphics g) { Graphics2D g2d = (Graphics2D) g; //如果是水平方向的 if (direction == UIScrollBar.HORIZONTAL) { paintHorizontal(g2d); } else { paintVertical(g2d); } } private void paintHorizontal(Graphics2D g2d) { int totalWidth = getWidth(); int paintX = 0; while (paintX < totalWidth) { int endX = paintX + BLUE_WIDTH; if (endX > totalWidth) { endX = totalWidth; } int[] x = new int[]{paintX, endX, endX, paintX, paintX}; int[] y = new int[]{0, 0, HEIGHT, HEIGHT, 0}; paintBlueArea(g2d, x, y); paintX += BLUE_WIDTH + BLUE_WIDTH / 2; } } private void paintVertical(Graphics2D g2d) { int totalHeight = getHeight(); int paintY = 0; while (paintY < totalHeight) { int endY = paintY + BLUE_WIDTH; if (endY > totalHeight) { endY = totalHeight; } int[] x = new int[]{0, HEIGHT, HEIGHT, 0, 0}; int[] y = new int[]{paintY, paintY, endY, endY, paintY}; paintBlueArea(g2d, x, y); paintY += BLUE_WIDTH + BLUE_WIDTH / 2; } } private void paintBlueArea(Graphics2D g2d, int[] x, int[] y) { g2d.setPaint(FlatUIUtils.getUIColor("DottedLine.defaultColor", new Color(37,118,239,1))); GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length); generalPath.moveTo(x[0], y[0]); for (int index = 1; index < x.length; index++) { generalPath.lineTo(x[index], y[index]); } generalPath.closePath(); g2d.fill(generalPath); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java index 1357b48354..09ea0d2052 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java @@ -1,5 +1,11 @@ package com.fr.design.mainframe; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.RectangleButtonUI; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.FlatDarkLaf; import com.fr.base.FRContext; import com.fr.base.svg.IconUtils; import com.fr.base.vcs.DesignerMode; @@ -9,7 +15,6 @@ import com.fr.design.constants.UIConstants; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.fun.PropertyItemPaneProvider; import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.ibutton.UIButtonUI; import com.fr.design.gui.icontainer.UIEastResizableContainer; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.VerticalFlowLayout; @@ -18,10 +23,7 @@ import com.fr.design.mainframe.share.collect.ComponentCollector; import com.fr.design.notification.SnapChat; import com.fr.design.notification.SnapChatFactory; import com.fr.design.ui.util.UIUtil; -import com.fr.design.utils.DesignUtils; -import com.fr.design.utils.SvgDrawUtils; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.design.utils.gui.GUIPaintUtils; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginContext; import com.fr.plugin.context.PluginRuntime; @@ -41,6 +43,8 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import java.awt.BorderLayout; import java.awt.CardLayout; @@ -49,9 +53,8 @@ import java.awt.Container; import java.awt.Cursor; import java.awt.Dimension; import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.GraphicsEnvironment; -import java.awt.Image; +import java.awt.Insets; import java.awt.Point; import java.awt.Rectangle; import java.awt.Toolkit; @@ -67,6 +70,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static com.fine.theme.utils.FineUIStyle.STYLE_TEXT; +import static com.fine.theme.utils.FineUIStyle.setStyle; +import static com.fr.design.i18n.Toolkit.i18nText; + public class EastRegionContainerPane extends UIEastResizableContainer { private static volatile EastRegionContainerPane THIS; private Map propertyItemMap; @@ -76,15 +83,14 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private FixedPopupPane currentPopupPane; private UIButton currentButton; private static final int CONTAINER_WIDTH = containerWidth(); - private static final int TAB_WIDTH = 38; - private static final int TAB_BUTTON_WIDTH = 32; - private static final int TAB_BUTTON_HEIGHT = 28; + private static final int TAB_WIDTH = FineUIScale.scale(42); + private static final int TAB_BUTTON_WIDTH = FineUIScale.scale(40); + private static final int TAB_BUTTON_HEIGHT = FineUIScale.scale(40); private static final int CONTENT_WIDTH = CONTAINER_WIDTH - TAB_WIDTH; - private static final int POPUP_TOOLPANE_HEIGHT = 27; - private static final int ARROW_RANGE_START = CONTENT_WIDTH - 30; + private static final int ARROW_RANGE_START = CONTENT_WIDTH - FineUIScale.scale(30); // 弹出对话框高度 - private static final int POPUP_MIN_HEIGHT = 145; - private static final int POPUP_DEFAULT_HEIGHT = 356; + private static final int POPUP_MIN_HEIGHT = FineUIScale.scale(145); + private static final int POPUP_DEFAULT_HEIGHT = FineUIScale.scale(356); public static final String KEY_CELL_ELEMENT = "cellElement"; public static final String KEY_CELL_ATTR = "cellAttr"; public static final String KEY_FLOAT_ELEMENT = "floatElement"; @@ -92,6 +98,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public static final String KEY_CONDITION_ATTR = "conditionAttr"; public static final String KEY_HYPERLINK = "hyperlink"; public static final String KEY_WIDGET_LIB = "widgetLib"; + public static final String KEY_AI_CHAT = "AIChat"; public static final String KEY_AUTHORITY_EDITION = "authorityEdition"; public static final String KEY_CONFIGURED_ROLES = "editedRoles"; public static final String DEFAULT_PANE = "defaultPane"; @@ -105,13 +112,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer { public enum PropertyMode { REPORT, // 报表 REPORT_PARA_WIDGET, //报表参数面板中的控件 - REPORT_PARA(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")), // 报表参数面板 + REPORT_PARA(i18nText("Fine-Design_Basic_Component_Settings")), // 报表参数面板 REPORT_FLOAT, // 报表悬浮元素 - FORM(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")), // 表单 + FORM(i18nText("Fine-Design_Basic_Component_Settings")), // 表单 FORM_REPORT, // 表单报表块 POLY, // 聚合报表 POLY_REPORT, // 聚合报表-报表块 - POLY_CHART(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")), // 聚合报表-图表块 + POLY_CHART(i18nText("Fine-Design_Basic_Component_Settings")), // 聚合报表-图表块 AUTHORITY_EDITION, // 权限编辑 AUTHORITY_EDITION_DISABLED, // 权限编辑 DUCHAMP_REPORT; @@ -119,7 +126,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private String title; PropertyMode() { - this.title = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Settings"); + this.title = i18nText("Fine-Design_Basic_Widget_Settings"); } PropertyMode(String title) { @@ -161,12 +168,12 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private EastRegionContainerPane() { super(); initPropertyItemList(); - defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No_Settings_Available")); - defaultAuthorityPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Not_Support_Authority_Edit")); + defaultPane = getDefaultPane(i18nText("Fine-Design_Basic_No_Settings_Available")); + defaultAuthorityPane = getDefaultPane(i18nText("Fine-Design_Basic_Not_Support_Authority_Edit")); switchMode(PropertyMode.REPORT); setContainerWidth(CONTAINER_WIDTH); - initPluginPane(); +// initPluginPane(); listenPlugin(); } @@ -278,19 +285,19 @@ public class EastRegionContainerPane extends UIEastResizableContainer { propertyItemMap = new LinkedHashMap<>(); // 有序map // 单元格元素 - PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Element"), + PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, i18nText("Fine-Design_Basic_Cell_Element"), "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT}); // 单元格属性 - PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Attributes"), + PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, i18nText("Fine-Design_Basic_Cell_Attributes"), "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT}); // 悬浮元素 - PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float_Element"), + PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, i18nText("Fine-Design_Basic_Float_Element"), "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT}); // 控件设置 - PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings"), + PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, i18nText("Fine-Design_Basic_Component_Settings"), "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART}, new ActionListener() { @Override @@ -299,18 +306,18 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } }); // 条件属性 - PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), + PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, i18nText("Fine-Design_Basic_Condition_Attributes"), "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT}); // 超级链接 - PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink"), + PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, i18nText("Fine-Design_Report_Hyperlink"), "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT, PropertyMode.DUCHAMP_REPORT}); // 组件库 widgetLibSnapChat = SnapChatFactory.createSnapChat(false, SnapChatKeys.COMPONENT); PropertyItem widgetLib = new PropertyItem( KEY_WIDGET_LIB, - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Library"), + i18nText("Fine-Design_Basic_Widget_Library"), "widgetlib", new PropertyMode[]{PropertyMode.FORM}, new PropertyMode[]{PropertyMode.FORM}, @@ -324,11 +331,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } }); // 权限编辑 - PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Permissions_Edition"), + PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, i18nText("Fine-Design_Report_Permissions_Edition"), "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED}, new PropertyMode[]{PropertyMode.AUTHORITY_EDITION}); // 已配置角色 - PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Configured_Roles"), + PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, i18nText("Fine-Design_Basic_Configured_Roles"), "configuredroles", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED}, new PropertyMode[]{PropertyMode.AUTHORITY_EDITION}); @@ -383,7 +390,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private void initRightPane() { rightPane = new JPanel(); propertyCard = new CardLayout(); - rightPane.setBackground(Color.green); rightPane.setLayout(propertyCard); for (PropertyItem item : propertyItemMap.values()) { if (item.isPoppedOut() || !item.isVisible()) { @@ -401,15 +407,15 @@ public class EastRegionContainerPane extends UIEastResizableContainer { // 左侧按钮面板 private void initLeftPane() { leftPane = new JPanel(); - leftPane.setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 4, 4)); + leftPane.setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0)); for (PropertyItem item : propertyItemMap.values()) { if (item.isPoppedOut() || !item.isVisible()) { continue; } leftPane.add(item.getButton()); } + leftPane.setBorder(BorderFactory.createMatteBorder(0, 1, 0, 1, UIManager.getColor("East.border"))); - leftPane.setBackground(UIConstants.PROPERTY_PANE_BACKGROUND); replaceLeftPane(leftPane); } @@ -557,6 +563,15 @@ public class EastRegionContainerPane extends UIEastResizableContainer { propertyItemMap.get(KEY_CONFIGURED_ROLES).replaceContentPane(pane); } + public void replaceAIChatPane(JComponent pane) { + propertyItemMap.get(KEY_AI_CHAT).replaceContentPane(pane); + } + + public JComponent getAIChatPane() { + return propertyItemMap.get(KEY_AI_CHAT).getContentPane(); + } + + public void replaceKeyPane(final String key, final JComponent pane) { //需要放到 ui 线程中处理 @@ -580,13 +595,18 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } public static void main(String[] args) { + try { + UIManager.setLookAndFeel( new FlatDarkLaf() ); + } catch (UnsupportedLookAndFeelException e) { + throw new RuntimeException(e); + } JFrame jf = new JFrame("test"); // jf = new JFrame("test"); jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); JPanel cc = new JPanel(); - cc.setBackground(Color.WHITE); +// cc.setBackground(Color.WHITE); // JPanel leftPane = new JPanel(); // leftPane.setBackground(Color.yellow); // JPanel rightPane = new JPanel(); @@ -738,29 +758,36 @@ public class EastRegionContainerPane extends UIEastResizableContainer { // 完整icon路径为 ICON_BASE_DIR + btnIconName + iconSuffix private static final String ICON_BASE_DIR = "/com/fr/design/standard/propertiestab/"; - private static final String ICON_SUFFIX_NORMAL = "_normal.svg"; - private static final String ICON_SUFFIX_DISABLED = "_disabled.svg"; - private static final String ICON_SUFFIX_SELECTED = "_selected.svg"; + + @Deprecated + private static final String ICON_SUFFIX_NORMAL_DEPRECATED = "_normal.svg"; + @Deprecated + private static final String ICON_SUFFIX_DISABLED_DEPRECATED = "_disabled.svg"; + @Deprecated + private static final String ICON_SUFFIX_SELECTED_DEPRECATED = "_selected.svg"; + + private static final String ICON_SUFFIX_NORMAL = StringUtils.EMPTY; + private static final String ICON_SUFFIX_DISABLED = "_disabled"; + private static final String ICON_SUFFIX_SELECTED = "_selected"; private static final int ICON_WIDTH = 18; private static final int ICON_HEIGHT = 18; private String btnIconName; private String iconBaseDir; private String iconSuffix = ICON_SUFFIX_NORMAL; // normal, diabled, selected, 三者之一 - private final Color selectedBtnBackground = new Color(0xF5F5F7); - private Color originBtnBackground; + private final Color selectedBtnBackground = UIManager.getColor("East.TabSelectedColor"); private ActionListener actionListener; public PropertyItem(String name, String title, String btnIconName, PropertyMode[] visibleModes, PropertyMode[] enableModes) { - this(name, title, btnIconName, ICON_BASE_DIR, visibleModes, enableModes, null, null); + this(name, title, btnIconName, null, visibleModes, enableModes, null, null); } public PropertyItem(String name, String title, String btnIconName, PropertyMode[] visibleModes, PropertyMode[] enableModes, SnapChat snapChat, PromptWindow promptWindow, ActionListener actionListener) { - this(name, title, btnIconName, ICON_BASE_DIR, visibleModes, enableModes, snapChat, promptWindow, actionListener); + this(name, title, btnIconName, null, visibleModes, enableModes, snapChat, promptWindow, actionListener); } public PropertyItem(String name, String title, String btnIconName, PropertyMode[] visibleModes, PropertyMode[] enableModes, ActionListener actionListener) { - this(name, title, btnIconName, ICON_BASE_DIR, visibleModes, enableModes, null, null, actionListener); + this(name, title, btnIconName, null, visibleModes, enableModes, null, null, actionListener); } public PropertyItem(String name, String title, String btnIconName, String iconBaseDir, PropertyMode[] visibleModes, PropertyMode[] enableModes, SnapChat snapChat, PromptWindow promptWindow) { @@ -861,7 +888,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private void initPropertyPanel() { propertyPanel = new JPanel(); - propertyPanel.setBackground(Color.pink); contentPane = generateContentPane(); popupToolPane = new PopupToolPane(this, PopupToolPane.DOWN_BUTTON); headerPane = new JPanel(); @@ -939,25 +965,38 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } private String getBtnIconUrl() { - return getIconBaseDir() + btnIconName + iconSuffix; } + private String getBtnIconId() { + return btnIconName + iconSuffix; + } + public void resetButtonIcon() { + button.setBackground(new Color(0, 0, 0, 0)); + button.setSelected(false); if (iconSuffix.equals(ICON_SUFFIX_SELECTED)) { iconSuffix = ICON_SUFFIX_NORMAL; + button.setIcon(new LazyIcon(getBtnIconId(), ICON_WIDTH)); + button.setOpaque(false); + } else if (ICON_SUFFIX_SELECTED_DEPRECATED.equals(iconSuffix)) { + iconSuffix = ICON_SUFFIX_NORMAL_DEPRECATED; button.setIcon(IconUtils.readIcon(getBtnIconUrl())); - button.setBackground(originBtnBackground); button.setOpaque(false); } } public void setTabButtonSelected() { resetPropertyIcons(); - iconSuffix = ICON_SUFFIX_SELECTED; - button.setIcon(IconUtils.readIcon(getBtnIconUrl())); - button.setBackground(selectedBtnBackground); + if (StringUtils.isEmpty(iconBaseDir)) { + iconSuffix = ICON_SUFFIX_SELECTED; + button.setIcon(new LazyIcon(getBtnIconId(), ICON_WIDTH)); + } else { + iconSuffix = ICON_SUFFIX_SELECTED_DEPRECATED; + button.setIcon(IconUtils.readIcon(getBtnIconUrl())); + } button.setOpaque(true); + button.setSelected(true); selectedItem = this; } @@ -966,33 +1005,15 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } private void initButton() { - button = new UIButton(IconUtils.readIcon(getBtnIconUrl())) { + button = new UIButton() { public Dimension getPreferredSize() { return new Dimension(TAB_BUTTON_WIDTH, TAB_BUTTON_HEIGHT); } - - @Override - public void paintComponent(Graphics g) { - super.paintComponent(g); - } }; - button.setDisabledIcon(IconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED)); + initButtonIcon(); button.set4LargeToolbarButton(); - button.setUI(new UIButtonUI() { - @Override - protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) { - if (isPressed(b) && b.isPressedPainted()) { - Color pressColor = isTabButtonSelected() ? UIConstants.TAB_BUTTON_PRESS_SELECTED : UIConstants.TAB_BUTTON_PRESS; - GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), pressColor); - } else if (isRollOver(b)) { - Color hoverColor = isTabButtonSelected() ? UIConstants.TAB_BUTTON_HOVER_SELECTED : UIConstants.TAB_BUTTON_HOVER; - GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), hoverColor); - } else if (b.isNormalPainted()) { - GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted()); - } - } - }); - originBtnBackground = button.getBackground(); + button.setUI(new RectangleButtonUI(false)); + setStyle(button, STYLE_TEXT); button.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -1012,6 +1033,16 @@ public class EastRegionContainerPane extends UIEastResizableContainer { button.setName(name); } + private void initButtonIcon() { + if (StringUtils.isEmpty(iconBaseDir)) { + button.setIcon(new LazyIcon(getBtnIconId(), ICON_WIDTH)); + button.setDisabledIcon(new LazyIcon(btnIconName + ICON_SUFFIX_DISABLED, ICON_WIDTH)); + } else { + button.setIcon(IconUtils.readIcon(getBtnIconUrl())); + button.setDisabledIcon(IconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED_DEPRECATED)); + } + } + public void processSnapChat() { if (snapChat != null && !snapChat.hasRead()) { snapChat.markRead(); @@ -1160,6 +1191,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer { // 弹出属性面板的工具条 private class PopupToolPane extends JPanel { + private final UIButton popupButton; + private final Insets defaultInsets = new Insets(0, 10, 0, 10); private String title; private PropertyItem propertyItem; private String buttonType; @@ -1178,28 +1211,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private static final String DOWN_BUTTON = "DownButton"; private MouseListener mouseListener = new MouseAdapter() { - @Override - public void mouseExited(MouseEvent e) { - setCursor(Cursor.getDefaultCursor()); - if (mouseDownCompCoords == null) { - contentPane.setBackground(originColor); - } - repaint(); - } - - @Override - public void mouseClicked(MouseEvent e) { - if (e.getX() >= ARROW_RANGE_START) { - onPop(); - } - } @Override public void mouseReleased(MouseEvent e) { mouseDownCompCoords = null; - if (!getBounds().contains(e.getPoint())) { - contentPane.setBackground(originColor); - } } @Override @@ -1217,7 +1232,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer { setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } else if (isMovable) { setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); - contentPane.setBackground(UIConstants.POPUP_TITLE_BACKGROUND); } else { setCursor(Cursor.getDefaultCursor()); } @@ -1261,36 +1275,44 @@ public class EastRegionContainerPane extends UIEastResizableContainer { this.propertyItem = propertyItem; this.title = propertyItem.getTitle(); originColor = UIConstants.UI_TOOLBAR_COLOR; + this.buttonType = buttonType; + this.setForeground(UIManager.getColor("DarkenedFontColor")); contentPane = new JPanel(); - contentPane.setBackground(originColor); contentPane.setLayout(new BorderLayout()); UILabel label = new UILabel(title); - contentPane.add(label, BorderLayout.WEST); - contentPane.setBorder(new EmptyBorder(5, 10, 5, 0)); + FineUIStyle.setStyle(label, FineUIStyle.LABEL_BOLD); + contentPane.add(label, BorderLayout.CENTER); + popupButton = createPopupButton(buttonType); + + contentPane.add(popupButton, BorderLayout.EAST); + Insets insets = FineUIUtils.getAndScaleUIInsets("PopupToolPane.borderInsets", defaultInsets); + contentPane.setBorder(new EmptyBorder(insets.top, insets.left, insets.bottom, insets.right)); setLayout(new BorderLayout()); add(contentPane, BorderLayout.CENTER); - setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.TOOLBAR_BORDER_COLOR)); - initToolButton(buttonType); - } - - public void setParentDialog(JDialog parentDialog) { - this.parentDialog = parentDialog; - isMovable = true; } - private void initToolButton(final String buttonType) { - this.buttonType = buttonType; - if (StringUtils.isEmpty(buttonType) || buttonType.equals(NO_BUTTON)) { - return; - } - // validate - if (!buttonType.equals(UP_BUTTON) && !buttonType.equals(DOWN_BUTTON)) { - throw new IllegalArgumentException("unknown button type: " + buttonType); + private UIButton createPopupButton(String type) { + UIButton popupButton = new UIButton(); + if (StringUtils.equals(type, UP_BUTTON)) { + popupButton = new UIButton(new LazyIcon("collapse_popup")); + } else if (StringUtils.equals(type, DOWN_BUTTON)) { + popupButton = new UIButton(new LazyIcon("expand_popup")); } + setStyle(popupButton, STYLE_TEXT); + popupButton.addActionListener(e -> { + this.buttonType = type; + onPop(); + }); addMouseMotionListener(mouseMotionListener); addMouseListener(mouseListener); + return popupButton; + } + + public void setParentDialog(JDialog parentDialog) { + this.parentDialog = parentDialog; + isMovable = true; } // 触发弹入、弹出 @@ -1304,24 +1326,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer { @Override public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, POPUP_TOOLPANE_HEIGHT); - } - - @Override - public void paint(Graphics g) { - super.paint(g); - Image button; - g.setColor(new Color(69, 135, 255)); - g.setFont(DesignUtils.getDefaultGUIFont().applySize(14)); - if (buttonType.equals(NO_BUTTON)) { - return; - } - if (buttonType.equals(DOWN_BUTTON)) { - button = UIConstants.POP_BUTTON_DOWN; - } else { - button = UIConstants.POP_BUTTON_UP; - } - SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, (ARROW_RANGE_START + 8), 4, null)); + int popupToolPaneHeight = UIManager.getInt("PopupToolPane.height"); + return new Dimension(super.getPreferredSize().width, FineUIScale.scale(popupToolPaneHeight)); } } @@ -1367,7 +1373,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { initListener(); this.setVisible(true); - defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No_Settings_Available")); + defaultPane = getDefaultPane(i18nText("Fine-Design_Basic_No_Settings_Available")); } public void showDefaultPane() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/ForbiddenPane.java b/designer-base/src/main/java/com/fr/design/mainframe/ForbiddenPane.java index 9c33534c7b..482986241b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/ForbiddenPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/ForbiddenPane.java @@ -8,8 +8,15 @@ import com.fr.design.mainframe.guide.base.GuideView; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.IOUtils; import com.fr.log.FineLoggerFactory; -import com.fr.workspace.WorkContext; import com.fr.report.lock.LockInfoOperator; +import com.fr.workspace.WorkContext; + +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.SwingWorker; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; @@ -22,12 +29,6 @@ import java.awt.LayoutManager; import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.SwingWorker; /** * @author hades @@ -38,7 +39,7 @@ public class ForbiddenPane extends JPanel { private static final ImageIcon LOCK_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/lock_template.png")); private static final Color TIP_COLOR = new Color(108, 174, 235); - private static final Color BUTTON_COLOR = new Color(63, 155, 249); + private static final Color BUTTON_COLOR = new Color(249, 63, 63); private static final int Y_GAP = 10; private static final int X_GAP = 10; private static final int ARC = 4; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java b/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java index adea8d7e4d..cef7222edf 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java @@ -1,18 +1,18 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.islider.UISlider; import com.fr.design.gui.itextfield.UINumberField; -import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.BorderFactory; -import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.plaf.basic.BasicSliderUI; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; @@ -20,9 +20,7 @@ import java.awt.EventQueue; import java.awt.FlowLayout; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Image; import java.awt.Point; -import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; @@ -30,13 +28,17 @@ import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; +import java.awt.geom.Path2D; import java.math.BigDecimal; +import static com.fine.theme.utils.FineUIStyle.LIGHT_GREY; +import static com.fine.theme.utils.FineUIStyle.setStyle; + + /** * Created by MoMeak on 2017/7/13. */ public class JFormSliderPane extends JPanel { - public static final Image APPFIT_V0 = BaseUtils.readImage("com/fr/design/images/control/icon_thumb_normal.png"); private static final double ONEPOINTEIGHT = 1.8; private static final int SIX = 6; @@ -45,8 +47,6 @@ public class JFormSliderPane extends JPanel { private static final int HUNDRED = 100; private static final int TWO_HUNDRED = 200; private static final int FOUR_HUNDRED = 400; - private static final int SHOWVALBUTTON_WIDTH = 35; - private static final int SHOWVALBUTTON_HEIGHTH = 20; private static final String SUFFIX = "%"; private static final int TOOLTIP_Y = 30; private static final Color BACK_COLOR = new Color(245, 245, 247); @@ -63,10 +63,11 @@ public class JFormSliderPane extends JPanel { public JFormSliderPane() { this.setLayout(new BorderLayout()); + setStyle(this, LIGHT_GREY); initSlider(); initDownUpButton(); initShowValField(); - JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0)); + JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 2)); panel.add(downButton); panel.add(slider); panel.add(upButton); @@ -74,7 +75,7 @@ public class JFormSliderPane extends JPanel { UILabel uiLabel = new UILabel(SUFFIX); uiLabel.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4)); panel.add(uiLabel); - panel.setBackground(BACK_COLOR); + panel.setOpaque(false); this.add(panel, BorderLayout.NORTH); } @@ -89,9 +90,7 @@ public class JFormSliderPane extends JPanel { } }; slider.setValue(HALF_HUNDRED); - slider.setUI(new JSliderPaneUI(slider)); slider.addChangeListener(listener); - slider.setPreferredSize(new Dimension(220, 20)); //去掉虚线框 slider.setFocusable(false); slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Slider")); @@ -99,32 +98,38 @@ public class JFormSliderPane extends JPanel { private void initDownUpButton() { - downButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalDown20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png")) { + downButton = new UIButton(new LazyIcon("zoomOut")) { public Point getToolTipLocation(MouseEvent event) { return new Point(event.getX(), event.getY() - TOOLTIP_Y); } }; - downButton.setOpaque(false); downButton.setBorderPainted(false); downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Down")); - upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png")) { + setStyle(downButton, FineUIStyle.STYLE_TEXT); + upButton = new UIButton(new LazyIcon("zoomIn")) { public Point getToolTipLocation(MouseEvent event) { return new Point(event.getX(), event.getY() - TOOLTIP_Y); } }; - upButton.setOpaque(false); upButton.setBorderPainted(false); upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Up")); downButton.setActionCommand("less"); upButton.setActionCommand("more"); downButton.addActionListener(buttonActionListener); upButton.addActionListener(buttonActionListener); + setStyle(upButton, FineUIStyle.STYLE_TEXT); } private void initShowValField() { - showValField = new UINumberField(); + showValField = new UINumberField() { + @Override + public Dimension getPreferredSize() { + int width = FineUIUtils.getAndScaleInt("FormSliderPane.showValueWidth", 40); + int height = FineUIUtils.getAndScaleInt("FormSliderPane.showValueHeight", 20); + return new Dimension(width, height); + } + }; showValField.setValue(showValue); - showValField.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH)); showValField.addKeyListener(new KeyListener() { @Override public void keyTyped(KeyEvent e) { @@ -223,6 +228,15 @@ public class JFormSliderPane extends JPanel { return result; } + @Override + public void paintComponent(Graphics g) { + int arc = FineUIUtils.getAndScaleInt("Center.arc", 10) / 2; + Path2D roundedPath = FineUIUtils.createPartRoundRectangle(0, 0, this.getWidth(), this.getHeight(), 0, 0, arc, 0); + FlatUIUtils.setRenderingHints(g); + Graphics2D g2 = (Graphics2D) g; + g2.setColor(getBackground()); + g2.fill(roundedPath); + } public static double divide(double v1, double v2, int scale) { BigDecimal b1 = new BigDecimal(Double.toString(v1)); @@ -283,66 +297,10 @@ public class JFormSliderPane extends JPanel { this.slider.addChangeListener(changeListener); } - class JSliderPaneUI extends BasicSliderUI { - - private static final int THUMB_XOFFSET = 8; - private static final int THUMB_YOFFSET = 3; - private static final int FOUR = 4; - private static final int FIVE = 5; - private static final int SIX = 6; - private static final int MID_X_SHIFT = 2; // 中点标记的水平位置偏移 - - public JSliderPaneUI(UISlider b) { - super(b); - } - - /** - * 绘制指示物 - */ - public void paintThumb(Graphics g) { - Rectangle knobBounds = thumbRect; - Graphics2D g2d = (Graphics2D) g; - g2d.drawImage(APPFIT_V0, knobBounds.x - THUMB_XOFFSET, knobBounds.y + THUMB_YOFFSET, null); - g2d.dispose(); - } - - /** - * 绘制刻度轨迹 - */ - public void paintTrack(Graphics g) { - int cy, cw; - Rectangle trackBounds = trackRect; - if (slider.getOrientation() == UISlider.HORIZONTAL) { - Graphics2D g2 = (Graphics2D) g; - cy = (trackBounds.height / 2); - cw = trackBounds.width; - g2.setPaint(BACK_COLOR); - g2.fillRect(0, -cy, cw + 10, cy * 4); - g.setColor(new Color(216, 216, 216)); - g.drawLine(0, cy, cw + 3, cy); - g.drawLine(MID_X_SHIFT + cw / 2, cy - FOUR, MID_X_SHIFT + cw / 2, cy + FOUR); - } else { - super.paintTrack(g); - } - } - - public void setThumbLocation(int x, int y) { - super.setThumbLocation(x, y); - slider.repaint(); - } - - } - - public static void main(String[] args) { - JFrame jf = new JFrame("test"); - jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel content = (JPanel) jf.getContentPane(); - content.setLayout(new BorderLayout()); - content.add(JFormSliderPane.getInstance(), BorderLayout.CENTER); - GUICoreUtils.centerWindow(jf); - jf.setSize(400, 80); - jf.setVisible(true); - + @Override + public Dimension getPreferredSize() { + Dimension size = super.getPreferredSize(); + return new Dimension(size.width, FineUIUtils.getAndScaleInt("Component.defaultHeight", 24)); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 960ffe92a9..a315b0e83c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe; import com.fanruan.product.ProductConstants; +import com.fine.theme.icon.LazyIcon; import com.fr.base.Parameter; import com.fr.base.TRL; import com.fr.base.extension.FileExtension; @@ -114,8 +115,6 @@ import javax.swing.JOptionPane; import javax.swing.SwingConstants; import javax.swing.undo.UndoManager; import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.FontMetrics; import java.io.ByteArrayOutputStream; import java.nio.file.Paths; import java.util.Arrays; @@ -180,7 +179,7 @@ public abstract class JTemplate> private TemplateThemeConfig.ThemeConfigChangeListener themeConfigChangeListener; public JTemplate() { - initAndStartPlugin(); +// initAndStartPlugin(); startListenThemeConfig(); } @@ -1443,8 +1442,23 @@ public abstract class JTemplate> */ public Icon getPreviewLargeIcon() { PreviewProvider provider = getPreviewType(); - String iconPath = provider.iconPathForLarge(); - return IconUtils.readIcon(iconPath); + if(StringUtils.isEmpty(provider.iconIdForPopupItem())) { + return IconUtils.readIcon(provider.iconPathForLarge()); + } else { + return new LazyIcon(provider.iconIdForPopupItem(), 32); + } + } + + /** + * 获取预览图标，兼容老图标获取方式（存在插件中未实现新图标） + * @return Icon + */ + public Icon getPreviewIcon(PreviewProvider provider) { + if(StringUtils.isEmpty(provider.iconIdForPopupItem())) { + return IconUtils.readIcon(provider.iconPathForPopupItem()); + } else { + return new LazyIcon(provider.iconIdForPopupItem()); + } } /** @@ -1592,14 +1606,7 @@ public abstract class JTemplate> } protected UIButton createTemplateThemeButton() { - UIButton button = new UIButton(IconUtils.readIcon("/com/fr/design/standard/template_theme")) { - @Override - public Dimension getPreferredSize() { - FontMetrics metrics = getFontMetrics(getFont()); - int width = Math.min(metrics.stringWidth(getText()) + PREDEFINED_ICON_WIDTH, 100); - return new Dimension(width, 20); - } - }; + UIButton button = new UIButton(new LazyIcon("template_theme")); button.setToolTipText(getTemplateTheme().getName()); button.setText(getTemplateTheme().getName()); button.setName(getTemplateTheme().getName()); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java index 911c0dc17a..04975208de 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignModelAdapter; import com.fr.design.designer.TargetComponent; import com.fr.design.file.HistoryTemplateListPane; @@ -246,9 +246,9 @@ public class JVirtualTemplate extends JTemplate { @Override public Icon getIcon() { if (getPath().endsWith("cpt")) { - return BaseUtils.readIcon("/com/fr/design/images/buttonicon/newcpts.png"); + return new LazyIcon("cpt_icon"); } else { - return BaseUtils.readIcon("/com/fr/web/images/form/new_form3.png"); + return new LazyIcon("frm_icon"); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java index d850e8e814..1ce37a4ba6 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java @@ -1,11 +1,12 @@ package com.fr.design.mainframe; +import com.fine.swing.ui.layout.Row; +import com.fine.swing.ui.layout.Spacer; +import com.fine.theme.utils.FineUIStyle; import com.fr.design.DesignState; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.TitlePlaceProcessor; -import com.fr.design.gui.imenu.UIMenuHighLight; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.loghandler.LogMessageBar; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; @@ -21,12 +22,13 @@ import com.fr.plugin.observer.PluginEventType; import com.fr.stable.os.support.OSBasedAction; import com.fr.stable.os.support.OSSupportCenter; +import javax.swing.BorderFactory; import javax.swing.JMenuBar; import javax.swing.JPanel; import javax.swing.SwingUtilities; +import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.FlowLayout; /** * @author shine @@ -66,8 +68,9 @@ public class NorthRegionContainerPane extends JPanel { ToolBarMenuDock ad = DesignerContext.getDesignerFrame().getToolBarMenuDock(); this.setLayout(new BorderLayout()); - this.add(new UIMenuHighLight(), BorderLayout.SOUTH); this.add(initNorthEastPane(ad), BorderLayout.EAST); + this.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("North.border"))); + FineUIStyle.setStyle(this, FineUIStyle.MENU_BAR); } /** @@ -77,7 +80,9 @@ public class NorthRegionContainerPane extends JPanel { protected JPanel initNorthEastPane(final ToolBarMenuDock ad) { //hugh: private修改为protected方便oem的时候修改右上的组件构成 //顶部日志+登陆按钮 - final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + final Row northEastPane = new Row(); + northEastPane.setSpacing(5); + northEastPane.setOpaque(false); initPluginListener(northEastPane, ad); refreshNorthEastPane(northEastPane, ad); return northEastPane; @@ -140,8 +145,6 @@ public class NorthRegionContainerPane extends JPanel { private void refreshNorthEastPane(final JPanel northEastPane, final ToolBarMenuDock ad) { northEastPane.removeAll(); - northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0)); - northEastPane.add(LogMessageBar.getInstance()); TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING); if (processor != null) { final Component[] bbsLoginPane = {null}; @@ -150,7 +153,7 @@ public class NorthRegionContainerPane extends JPanel { public void execute(Object... objects) { bbsLoginPane[0] = ad.createBBSLoginPane(); } - }, SupportOSImpl. BBS_USER_LOGIN_PANE); + }, SupportOSImpl.BBS_USER_LOGIN_PANE); processor.hold(northEastPane, LogMessageBar.getInstance(), bbsLoginPane[0]); } northEastPane.add(ad.createAlphaFinePane()); @@ -160,7 +163,8 @@ public class NorthRegionContainerPane extends JPanel { /// 新手引导功能，暂时屏蔽 // northEastPane.add(ad.createGuideEntryPane()); northEastPane.add(ad.createNotificationCenterPane()); - + northEastPane.add(LogMessageBar.getInstance()); + northEastPane.add(new Spacer(5)); OSSupportCenter.buildAction(new OSBasedAction() { @Override public void execute(Object... objects) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java deleted file mode 100644 index 64d58bd8e5..0000000000 --- a/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.fr.design.mainframe; - -import com.fr.base.svg.IconUtils; -import com.fr.design.file.NewTemplatePane; - -import javax.swing.Icon; - -/** - * Created by hzzz on 2017/12/26. - */ -public class ToolBarNewTemplatePane extends NewTemplatePane { - - private static final ToolBarNewTemplatePane instance = new ToolBarNewTemplatePane(); - - private ToolBarNewTemplatePane() { - } - - public static NewTemplatePane getInstance() { - return instance; - } - - @Override - public Icon getNew() { - return IconUtils.readIcon("/com/fr/design/standard/addicon/addicon"); - } - - @Override - public Icon getMouseOverNew() { - return IconUtils.readIcon("/com/fr/design/standard/addicon/add_press.svg"); - } - - @Override - public Icon getMousePressNew() { - return IconUtils.readIcon("/com/fr/design/standard/addicon/add_press.svg"); - } -} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/WestRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/WestRegionContainerPane.java index 004fbd55a3..8d037e330c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/WestRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/WestRegionContainerPane.java @@ -1,10 +1,11 @@ package com.fr.design.mainframe; +import com.fine.theme.utils.FineUIScale; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignerEnvManager; -import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.gui.icontainer.UIResizableContainer; +import com.fr.design.ui.util.UIUtil; import com.fr.general.GeneralContext; import com.fr.plugin.context.PluginContext; import com.fr.plugin.injectable.PluginModule; @@ -16,6 +17,7 @@ import com.fr.stable.Constants; public class WestRegionContainerPane extends UIResizableContainer { private static WestRegionContainerPane THIS; + private static final int WEST_CONTAINER_WIDTH = 165; /** * 得到实例 @@ -39,12 +41,13 @@ public class WestRegionContainerPane extends UIResizableContainer { @Override public void on(PluginEvent event) { - - if (getDownPane() != null) { - replaceDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter())); - } else { - setDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter())); - } + UIUtil.invokeLaterIfNeeded(()-> { + if (getDownPane() != null) { + replaceDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter())); + } else { + setDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter())); + } + }); } }, new PluginFilter() { @@ -55,7 +58,6 @@ public class WestRegionContainerPane extends UIResizableContainer { } }); - setContainerWidth(165); - setBackground(UIConstants.TREE_BACKGROUND); + setContainerWidth(FineUIScale.scale(WEST_CONTAINER_WIDTH)); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java index 086a07da48..d0f8f88c93 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.backgroundpane; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.base.background.ColorBackground; import com.fr.design.event.UIObserverListener; import com.fr.design.layout.FRGUIPaneFactory; @@ -29,6 +30,7 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane { return false; } }; + colorSelectBox.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); this.add(colorSelectBox, BorderLayout.NORTH); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java index 6c3ea9e727..176cd9b8c5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java @@ -1,20 +1,20 @@ package com.fr.design.mainframe.backgroundpane; +import com.fine.swing.ui.layout.Layouts; import com.fr.base.background.GradientBackground; +import com.fr.design.constants.LayoutConstants; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.background.gradient.GradientBar; import com.fr.general.Background; -import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.awt.*; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * @author zhou * @since 2012-5-30上午10:36:21 @@ -39,24 +39,17 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane { } private void constructPane(){ - String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom")}; Integer[] valueArray = {GradientBackground.LEFT2RIGHT, GradientBackground.TOP2BOTTOM}; - directionPane = new UIButtonGroup(textArray, valueArray); + directionPane = new UIButtonGroup<>(textArray, valueArray); directionPane.setSelectedIndex(0); gradientBar = new GradientBar(4, this.gradientBarWidth); - - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p,}; - - Component[][] components = new Component[][]{ - new Component[]{gradientBar, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction")), directionPane} - }; - JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); - this.add(Gradient, BorderLayout.CENTER); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(gradientBar), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction"))).weight(1), cell(directionPane).weight(2)) + ).getComponent(), BorderLayout.CENTER); } public void populateBean(Background background) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java index e1496ff3d6..6bdc8bb008 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java @@ -1,10 +1,10 @@ package com.fr.design.mainframe.backgroundpane; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; import com.fr.base.Style; import com.fr.base.background.ImageFileBackground; import com.fr.base.frpx.pack.PictureCollection; -import com.fr.design.border.UIRoundedBorder; -import com.fr.design.constants.UIConstants; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.frpane.ImgChooseWrapper; import com.fr.design.gui.ibutton.UIButton; @@ -24,6 +24,8 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.theme.utils.FineUIScale.scale; + /** * @author zhou * @since 2012-5-29下午1:12:06 @@ -52,8 +54,8 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { previewPane = new ImagePreviewPane(); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - borderPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5)); - borderPane.setPreferredSize(new Dimension(0, 145)); + borderPane.setBorder(new FineRoundBorder()); + borderPane.setPreferredSize(new Dimension(super.getPreferredSize().width, scale(145))); borderPane.add(previewPane, BorderLayout.CENTER); this.add(borderPane, BorderLayout.NORTH); previewPane.addChangeListener(imageSizeChangeListener); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java index 8f4c2ecfbf..789bcd16cf 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java @@ -1,15 +1,16 @@ package com.fr.design.mainframe.backgroundpane; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.GraphHelper; import com.fr.base.background.PatternBackground; -import com.fr.design.border.UIRoundedBorder; import com.fr.design.constants.LayoutConstants; import com.fr.design.constants.UIConstants; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.color.ColorSelectBox; import com.fr.general.Background; @@ -22,6 +23,9 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.geom.Rectangle2D; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * @author zhou * @since 2012-5-29下午1:12:33 @@ -29,7 +33,6 @@ import java.awt.geom.Rectangle2D; public class PatternBackgroundQuickPane extends BackgroundQuickPane { private int patternIndex = 0; // pattern setIndex. - private final static int DEFAULT_DIM_HEIGHT = 210; private final static Color DEFAULT_FOREGROUND = Color.lightGray; private final static Color DEFAULT_BACKGROUND = Color.black; private ColorSelectBox foregroundColorPane; @@ -40,11 +43,11 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane { this.setLayout(new BorderLayout(0, 4)); JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); this.add(contentPane, BorderLayout.NORTH); - contentPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5)); + contentPane.setBorder(new FineRoundBorder()); JPanel typePane2 = new JPanel(); contentPane.add(typePane2); typePane2.setLayout(new GridLayout(0, 8, 1, 1)); - typePane2.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8)); + typePane2.setBorder(new ScaledEmptyBorder(8, 8, 8, 8)); ButtonGroup patternButtonGroup = new ButtonGroup(); patternButtonArray = new PatternButton[PatternBackground.PATTERN_COUNT]; for (int i = 0; i < PatternBackground.PATTERN_COUNT; i++) { @@ -52,41 +55,22 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane { patternButtonGroup.add(patternButtonArray[i]); typePane2.add(patternButtonArray[i]); } - foregroundColorPane = new ColorSelectBox(60); - backgroundColorPane = new ColorSelectBox(60); + foregroundColorPane = new ColorSelectBox(FineUIScale.scale(60)); + backgroundColorPane = new ColorSelectBox(FineUIScale.scale(60)); foregroundColorPane.setSelectObject(DEFAULT_FOREGROUND); foregroundColorPane.setSelectObject(DEFAULT_BACKGROUND); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - Component[][] components = new Component[][]{ - new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground"), UILabel.LEFT), foregroundColorPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), UILabel.LEFT), backgroundColorPane}, - }; - double[] rowSize = {p, p, p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; - JPanel colorPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_LARGE); - this.add(colorPane, BorderLayout.CENTER); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground"), UILabel.LEFT)).weight(1), + cell(foregroundColorPane).weight(4)), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), UILabel.LEFT)).weight(1), + cell(backgroundColorPane).weight(4)) + ).with(it -> it.setBorder(new ScaledEmptyBorder(LayoutConstants.VERTICAL_GAP, 0, 0, 0))).getComponent(), BorderLayout.CENTER); foregroundColorPane.addSelectChangeListener(colorChangeListener); backgroundColorPane.addSelectChangeListener(colorChangeListener); } - @Override - public Dimension getPreferredSize() { - Dimension dim = super.getPreferredSize(); - dim.height = DEFAULT_DIM_HEIGHT; - return dim; - } - - private JPanel createLabelColorPane(String text, JComponent colorPane) { - JPanel labelColorPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - labelColorPane.add(new UILabel(text)); - labelColorPane.add(colorPane); - - return labelColorPane; - } - public void populateBean(Background background) { PatternBackground patternBackground = (PatternBackground) background; int patternIndex = patternBackground.getPatternIndex(); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java index e9aed06acd..4597f8fa93 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java @@ -1,19 +1,28 @@ package com.fr.design.mainframe.backgroundpane; +import com.fine.theme.light.ui.FineRoundBorder; import com.fr.base.GraphHelper; import com.fr.base.background.TextureBackground; import com.fr.design.constants.UIConstants; -import com.fr.design.border.UIRoundedBorder; import com.fr.design.event.UIObserverListener; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; import com.fr.general.ComparatorUtils; -import javax.swing.*; +import javax.swing.JPanel; +import javax.swing.ButtonGroup; +import javax.swing.JToggleButton; +import javax.swing.BorderFactory; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; +import java.awt.TexturePaint; +import java.awt.BorderLayout; +import java.awt.GridLayout; +import java.awt.Dimension; +import java.awt.Cursor; +import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.geom.Rectangle2D; @@ -27,7 +36,7 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - borderPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5)); + borderPane.setBorder(new FineRoundBorder()); JPanel contentPane = new JPanel(); borderPane.add(contentPane, BorderLayout.NORTH); this.add(borderPane, BorderLayout.NORTH); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java index 1d09f24828..dc502dcdf4 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java @@ -1,7 +1,7 @@ package com.fr.design.mainframe.check; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; -import com.fr.base.svg.IconUtils; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; @@ -45,7 +45,7 @@ public class CheckButton extends UIButton { private UILabel imageLabel; public CheckButton() { - this.setIcon(IconUtils.readIcon("/com/fr/design/standard/font_miss_check")); + this.setIcon(new LazyIcon("font_miss_check")); this.setToolTipText(Toolkit.i18nText("Fine_Designer_Check_Font")); this.set4ToolbarButton(); this.addActionListener(checkListener); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckFontInfoDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckFontInfoDialog.java index 8274b65355..b40ecae957 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckFontInfoDialog.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckFontInfoDialog.java @@ -1,5 +1,10 @@ package com.fr.design.mainframe.check; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.dialog.link.MessageWithLink; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; @@ -17,12 +22,21 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.UIManager; import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Frame; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 字体缺失检测的具体结果对话框 * @@ -53,64 +67,63 @@ public class CheckFontInfoDialog extends JDialog implements ActionListener { super(parent,true); //提示信息 JPanel imagePanel = new JPanel(); - imageLabel = new UILabel(IOUtils.readIcon("com/fr/design/images/warnings/warning32.png")); + imageLabel = new UILabel(new LazyIcon("warning", 20)); imagePanel.add(imageLabel); String link = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT); - JPanel messagePanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true); + JPanel messagePanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); MessageWithLink linkMessage = new MessageWithLink(Toolkit.i18nText("Fine_Designer_Check_Font_Message"), Toolkit.i18nText("Fine_Designer_Check_Font_Install_Font"), link); - linkMessage.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink")); messagePanel.add(linkMessage); // 查看详情按钮 directUiLabel = new UILabel(); - directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right")); + directUiLabel.setIcon(new LazyIcon("plus")); detailLabel = new UILabel(); detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail")); - upInTopPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - upInTopPanel.add(imageLabel, BorderLayout.WEST); - upInTopPanel.add(messagePanel, BorderLayout.CENTER); - - downInTopPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - downInTopPanel.add(directUiLabel, BorderLayout.WEST); - downInTopPanel.add(detailLabel, BorderLayout.CENTER); - - topPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true); - topPanel.add(upInTopPanel, BorderLayout.NORTH); - topPanel.add(downInTopPanel, BorderLayout.SOUTH); + upInTopPanel = row( + 10, + column(cell(imageLabel), flex()), + column(cell(messagePanel))).getComponent(); + upInTopPanel.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); + downInTopPanel = row(fix(30), row(cell(directUiLabel), cell(detailLabel), flex())).getComponent(); + topPanel = column(cell(upInTopPanel), cell(downInTopPanel)).getComponent(); //中间的详情展示(可隐藏) hiddenPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - hiddenPanel.setBorder(BorderFactory.createEmptyBorder(0,12,0,12)); JScrollPane scrollPane = new JScrollPane(); JTextArea checkArea = new JTextArea(areaText); scrollPane.setViewportView(checkArea); scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + scrollPane.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + scrollPane.getViewport().setOpaque(false); + checkArea.setOpaque(false); checkArea.setEnabled(false); - hiddenPanel.add(scrollPane); + hiddenPanel = row(fix(30), cell(scrollPane).weight(1)).getComponent(); hiddenPanel.setVisible(false); + hiddenPanel.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); downInTopPanel.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { if (hiddenPanel.isVisible()) { hiddenPanel.setVisible(false); - CheckFontInfoDialog.this.setSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.check.CheckFontInfoDialog.collapse")); + CheckFontInfoDialog.this.setSize(FineUIScale.scale(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.check.CheckFontInfoDialog.collapse"))); detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail")); - directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right")); + directUiLabel.setIcon(new LazyIcon("plus")); } else { - CheckFontInfoDialog.this.setSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.check.CheckFontInfoDialog.unfold")); + CheckFontInfoDialog.this.setSize(FineUIScale.scale(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.check.CheckFontInfoDialog.unfold"))); hiddenPanel.setVisible(true); detailLabel.setText(Toolkit.i18nText("Fine_Designer_Hide_Detail")); - directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.down")); + directUiLabel.setIcon(new LazyIcon("minus")); } } }); //底部的按钮面板 UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); + FineUIStyle.setStyle(okButton, FineUIStyle.STYLE_PRIMARY); okButton.addActionListener(this); bottomPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); bottomPanel.setBorder(BorderFactory.createEmptyBorder(10,10,10,10)); @@ -122,7 +135,7 @@ public class CheckFontInfoDialog extends JDialog implements ActionListener { this.add(topPanel, BorderLayout.NORTH); this.add(hiddenPanel, BorderLayout.CENTER); this.add(bottomPanel, BorderLayout.SOUTH); - this.setSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.check.CheckFontInfoDialog.collapse")); + this.setSize(FineUIScale.scale(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.check.CheckFontInfoDialog.collapse"))); GUICoreUtils.centerWindow(this); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/base/GuideView.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/base/GuideView.java index 6a9a60615f..97ef1a1a55 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/guide/base/GuideView.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/base/GuideView.java @@ -23,7 +23,7 @@ public class GuideView extends JDialog { private float modalOpacity; private Window window; - public static GuideView getInstance(Guide guide) { + public static synchronized GuideView getInstance(Guide guide) { if (guideView == null) { guideView = new GuideView(DesignerContext.getDesignerFrame(), guide); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index b36ca47294..240a0f23c4 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -1,5 +1,8 @@ package com.fr.design.mainframe.loghandler; +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.stable.collections.combination.Pair; import com.fr.base.BaseUtils; import com.fr.base.TRL; @@ -97,11 +100,11 @@ public class DesignerLogHandler { // 所有的面板 private LogHandlerBar caption; - private JCheckBoxMenuItem showInfo; + private UICheckBox showInfo; - private JCheckBoxMenuItem showError; + private UICheckBox showError; - private JCheckBoxMenuItem showServer; + private UICheckBox showServer; private LogHandlerArea logHandlerArea; @@ -137,11 +140,11 @@ public class DesignerLogHandler { caption.clearMessage(); } }; - showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Info"), true); + showInfo = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Info"), true); showInfo.addItemListener(itemlistener); - showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Warn"), true); + showError = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Warn"), true); showError.addItemListener(itemlistener); - showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Error"), true); + showServer = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Error"), true); showServer.addItemListener(itemlistener); caption.addSetListener(new ActionListener() { @@ -149,21 +152,20 @@ public class DesignerLogHandler { public void actionPerformed(ActionEvent e) { JPopupMenu jPopupMenu = new JPopupMenu(); + jPopupMenu.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); int logLevelInt = Log4jConfig.getInstance().getRootLevel().intLevel(); if (logLevelInt <= DesignerLogger.INFO_INT) { jPopupMenu.add(showInfo); jPopupMenu.add(showError); jPopupMenu.add(showServer); - jPopupMenu.show(caption, caption.getWidth() + GAP_X, INFO_GAP_Y); } else if (logLevelInt == DesignerLogger.ERROR_INT) { jPopupMenu.add(showError); jPopupMenu.add(showServer); - jPopupMenu.show(caption, caption.getWidth() + GAP_X, ERRO_GAP_Y); } else { jPopupMenu.add(showServer); - jPopupMenu.show(caption, caption.getWidth() + GAP_X, SERVER_GAP_Y); } + jPopupMenu.show(caption, caption.getWidth() - (int) jPopupMenu.getPreferredSize().getWidth() - 10, (int) -jPopupMenu.getPreferredSize().getHeight()); } }); } @@ -206,22 +208,22 @@ public class DesignerLogHandler { this.setPreferredSize(new Dimension(super.getPreferredSize().width, 150)); jTextArea.setEditable(false); - jTextArea.setBackground(Color.WHITE); +// jTextArea.setBackground(Color.WHITE); popup = new JPopupMenu(); selectAll = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_All")); selectAll.addActionListener(popupListener); - selectAll.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/selectedall.png")); + selectAll.setIcon(new LazyIcon("select_all")); popup.add(selectAll); copy = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy")); copy.addActionListener(popupListener); - copy.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png")); + copy.setIcon(new LazyIcon("copy")); popup.add(copy); clear = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear_All")); clear.addActionListener(popupListener); - clear.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/clear.png")); + clear.setIcon(new LazyIcon("clearStash")); popup.add(clear); selectAll.setAccelerator(KeyStroke.getKeyStroke('A', DEFAULT_MODIFIER)); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java index eb9ba74c2e..1aa6b951ae 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java @@ -1,6 +1,8 @@ package com.fr.design.mainframe.loghandler; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.ui.util.UIUtil; @@ -34,7 +36,7 @@ public class LogHandlerBar extends JPanel implements ItemSelectable { private int ERRORNUM = 0; private int SERVERNUM = 0; private static final int FLOW_LAYOUT_HGAP = 10; - private static final int FLOW_LAYOUT_VGAP = 5; + private static final int FLOW_LAYOUT_VGAP = 8; private boolean isWithSerious; @@ -44,27 +46,20 @@ public class LogHandlerBar extends JPanel implements ItemSelectable { public LogHandlerBar(String text) { this.setLayout(new FlowLayout(FlowLayout.RIGHT, FLOW_LAYOUT_HGAP, FLOW_LAYOUT_VGAP)); - this.setUI(new LogHandlerBarUI()); +// this.setUI(new LogHandlerBarUI()); this.text = text; - clear = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/clear.png")); - clear.setMargin(null); - clear.setOpaque(false); - clear.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + clear = creatPlainButtonByIconId("clearStash"); clear.setToolTipText(i18nText("Fine-Design_Basic_Clear_All")); - selectedall = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/selectedall.png")); - selectedall.setMargin(null); - selectedall.setOpaque(false); - selectedall.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + selectedall = creatPlainButtonByIconId("selected_all"); selectedall.setToolTipText(i18nText("Fine-Design_Basic_Select_All")); - set = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/setting.png")); - set.setMargin(null); - set.setOpaque(false); - set.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + set = creatPlainButtonByIconId("filter_popup"); set.setToolTipText(i18nText("Fine-Design_Report_Set")); normalLabel = new UILabel(i18nText("Fine-Design_Basic_NNormal") + "(0)"); + normalLabel.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); alertLabel = new UILabel(i18nText("Fine-Design_Basic_Alert") + "(0)"); + alertLabel.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); seriouslyLabel = new UILabel(i18nText("Fine-Design_Basic_Seriously") + "(0)"); - + seriouslyLabel.setBorder(new ScaledEmptyBorder(0, 0, 0, 10)); this.add(normalLabel); this.add(alertLabel); this.add(seriouslyLabel); @@ -73,6 +68,12 @@ public class LogHandlerBar extends JPanel implements ItemSelectable { this.add(set); } + private UIButton creatPlainButtonByIconId(String iconId) { + UIButton button = new UIButton(new LazyIcon(iconId, 18)); + FineUIStyle.setStyle(button, FineUIStyle.PLAIN_BUTTON); + return button; + } + /** * 更新日志数量统计标签 */ diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java index fded318188..292c2d593f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java @@ -1,23 +1,28 @@ package com.fr.design.mainframe.loghandler; -import com.fr.design.constants.UIConstants; -import com.fr.design.gui.ilable.UILabel; -import com.fr.stable.StringUtils; - +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.ibutton.UIButton; import javax.swing.JFrame; -import javax.swing.JPanel; import java.awt.BorderLayout; -import java.awt.Dimension; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -public class LogMessageBar extends JPanel { +import static com.fine.theme.utils.FineUIStyle.setStyle; + +/** + * 日志消息 + * + * @author Leo.Qin + * @Created on 2023/12/28 + * @since 11.0 + */ +public class LogMessageBar extends BasicPane { - private static final String LOG_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log"); - private UILabel messageLabel; - private int width = 600; + private UIButton logButton; private static volatile LogMessageBar THIS; private JFrame dlg = new LogDetailPane().showDialog(); @@ -32,18 +37,15 @@ public class LogMessageBar extends JPanel { return THIS; } - public static LogMessageBar getInstance(int width) { - LogMessageBar bar = LogMessageBar.getInstance(); - bar.setLoggerBarWidth(width); - return bar; - } - private LogMessageBar() { - messageLabel = new UILabel(); setLayout(new BorderLayout()); - add(messageLabel, BorderLayout.CENTER); - setBackground(UIConstants.LOG_MESSAGE_BAR_BACKGROUND); - addMouseListener(new MouseAdapter() { + setOpaque(false); + logButton = new UIButton(new LazyIcon("logMsg")); + logButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_Log_Message")); + logButton.set4ToolbarButton(); + setStyle(logButton, FineUIStyle.STYLE_TEXT); + add(logButton); + logButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { if (dlg != null && dlg.isVisible()) { @@ -58,25 +60,11 @@ public class LogMessageBar extends JPanel { } public void setMessage(String message) { - if (message == null) { - return; - } - messageLabel.setText(LOG_MARK + " | " + message); - repaint(); + logButton.setIcon(new LazyIcon("logMsg_dot")); } public void clear() { - messageLabel.setText(StringUtils.EMPTY); - repaint(); - } - - public void setLoggerBarWidth(int width) { - this.width = width; - } - - @Override - public Dimension getPreferredSize() { - return new Dimension(width, 24); + logButton.setIcon(new LazyIcon("logMsg")); } /** @@ -92,4 +80,9 @@ public class LogMessageBar extends JPanel { public JFrame getLogFrame() { return dlg; } + + @Override + protected String title4PopupWindow() { + return "LogCenter"; + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateDirTreeSearchPane.java b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateDirTreeSearchPane.java index 07636ce631..73d909ae81 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateDirTreeSearchPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateDirTreeSearchPane.java @@ -1,9 +1,7 @@ package com.fr.design.mainframe.manager.search.searcher.control.pane; -import com.fr.base.svg.IconUtils; -import com.fr.design.constants.UIConstants; +import com.fr.design.data.datapane.management.search.pane.FineSearchPane; import com.fr.design.file.TemplateDirTreePane; -import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; @@ -39,7 +37,7 @@ public class TemplateDirTreeSearchPane extends JPanel implements TreeSearchStatu /** * 搜索面板 */ - private JPanel searchPane; + private FineSearchPane searchPane; private final KeyAdapter enterPressed = new KeyAdapter() { @Override @@ -61,27 +59,12 @@ public class TemplateDirTreeSearchPane extends JPanel implements TreeSearchStatu } private void initSearchPane() { - searchPane = new JPanel(FRGUIPaneFactory.createBorderLayout()); - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR)); - searchPane.setBackground(Color.WHITE); - // 左侧搜索图标 - UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/search")); - searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0)); - searchLabel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - // do nothing - } - }); - + searchPane = new FineSearchPane(); // 中间输入框 initSearchTextField(); - // 右侧返回图标 - UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/clear")); - returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return")); - returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11)); - returnLabel.addMouseListener(new MouseAdapter() { + searchPane.setClearToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return")); + searchPane.addClearMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { TemplateDirTreeSearchManager.getInstance().outOfSearchMode(); @@ -89,34 +72,11 @@ public class TemplateDirTreeSearchPane extends JPanel implements TreeSearchStatu } }); - searchPane.add(searchLabel, BorderLayout.WEST); - searchPane.add(searchTextField, BorderLayout.CENTER); - searchPane.add(returnLabel, BorderLayout.EAST); } private void initSearchTextField() { - searchTextField = new UITextField(){ - @Override - public Insets getInsets() { - return new Insets(2, 4, 0, 4); - } - }; - searchTextField.setBorderPainted(false); - searchTextField.setPlaceholder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Dir_Search_Press_Enter_For_Search")); - searchTextField.addFocusListener(new FocusListener() { - @Override - public void focusGained(FocusEvent e) { - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.NORMAL_BLUE)); - searchPane.repaint(); - } - - @Override - public void focusLost(FocusEvent e) { - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR)); - searchPane.repaint(); - } - }); - this.searchTextField.getDocument().addDocumentListener(new DocumentListener() { + searchPane.setPlaceholder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Dir_Search_Press_Enter_For_Search")); + searchPane.addDocumentListener(new DocumentListener() { @Override public void insertUpdate(DocumentEvent e) { } @@ -130,7 +90,7 @@ public class TemplateDirTreeSearchPane extends JPanel implements TreeSearchStatu public void changedUpdate(DocumentEvent e) { } }); - this.searchTextField.addKeyListener(enterPressed); + searchPane.addKeyListener(enterPressed); } private void dealWithTextChange() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateSearchRemindPane.java b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateSearchRemindPane.java index bdb6a32819..b23b3c073f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateSearchRemindPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateSearchRemindPane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.manager.search.searcher.control.pane; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.svg.IconUtils; import com.fr.design.constants.UIConstants; import com.fr.design.gui.itree.filetree.EnvFileTree; @@ -12,18 +14,20 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager; -import javax.swing.BorderFactory; +import javax.swing.JLayer; import javax.swing.JPanel; import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.CardLayout; -import java.awt.Color; -import java.awt.Dimension; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.FlowLayout; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; + /** * 模板搜索提示面板：整合了模板树和提示面板 */ @@ -94,7 +98,7 @@ public class TemplateSearchRemindPane extends JPanel implements TreeSearchStatus private class TreePane extends JPanel implements TemplateSearchRemindPane.TreeSearchStatusChange { - private UIScrollPane scrollPane; + private JLayer scrollPane; private JPanel notFoundPane; @@ -110,21 +114,18 @@ public class TemplateSearchRemindPane extends JPanel implements TreeSearchStatus private void init(EnvFileTree templateFileTree) { - scrollPane = new UIScrollPane(templateFileTree); - scrollPane.setBorder(null); + scrollPane = FineUIUtils.createCollapsibleScrollBarLayer(templateFileTree); - notFoundPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5); UILabel emptyPicLabel = new UILabel(); emptyPicLabel.setIcon(IconUtils.readIcon("com/fr/base/images/share/no_match_icon.png")); emptyPicLabel.setHorizontalAlignment(SwingConstants.CENTER); - emptyPicLabel.setPreferredSize(new Dimension(240, 100)); UILabel textLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tree_Search_Not_Match"), SwingConstants.CENTER); - textLabel.setForeground(Color.gray); + FineUIStyle.setStyle(textLabel, FineUIStyle.LABEL_TIP); textLabel.setHorizontalAlignment(SwingConstants.CENTER); - textLabel.setPreferredSize(new Dimension(240, 20)); - notFoundPane.add(emptyPicLabel); - notFoundPane.add(textLabel); - notFoundPane.setBorder(BorderFactory.createEmptyBorder(80, 0, 0, 0)); + + notFoundPane = column(10, + flex(1), cell(emptyPicLabel), cell(textLabel), flex(1.5) + ).getComponent(); cardLayout = new CardLayout(); this.setLayout(cardLayout); @@ -181,7 +182,7 @@ public class TemplateSearchRemindPane extends JPanel implements TreeSearchStatus this.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 0)); // 初始情况下为Not_Begin textLabel = new UILabel(); - textLabel.setForeground(Color.gray); + FineUIStyle.setStyle(textLabel, FineUIStyle.LABEL_TIP); stopLabel = new UILabel(); stopLabel.setForeground(UIConstants.NORMAL_BLUE); stopSearch = new MouseAdapter() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java index ee9b861b1e..0400672c12 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java @@ -1,34 +1,23 @@ package com.fr.design.mainframe.manager.search.searcher.control.pane; -import com.fr.base.svg.IconUtils; -import com.fr.design.constants.UIConstants; -import com.fr.design.search.event.TreeSearchStatusChangeEvent; -import com.fr.design.search.event.TreeSearchStatusChangeListener; -import com.fr.design.search.TreeSearchStatus; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.data.datapane.management.search.pane.FineSearchPane; import com.fr.design.file.TemplateTreePane; -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itoolbar.UIToolbar; -import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager; +import com.fr.design.search.TreeSearchStatus; +import com.fr.design.search.event.TreeSearchStatusChangeEvent; +import com.fr.design.search.event.TreeSearchStatusChangeListener; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import java.awt.BorderLayout; import java.awt.CardLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Insets; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; /** * 模板搜索工具栏 @@ -57,12 +46,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS /** * 搜索面板 */ - private JPanel searchPane; - - /** - * 搜索输入框 - */ - private UITextField searchTextField; + private FineSearchPane searchPane; /** * 内容面板 @@ -78,7 +62,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { - TemplateTreeSearchManager.getInstance().startSearch(searchTextField.getText()); + TemplateTreeSearchManager.getInstance().startSearch(searchPane.getText()); } } }; @@ -90,7 +74,6 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS initSearchPane(); initContentPane(); add(contentPane, BorderLayout.CENTER); - setPreferredSize(new Dimension(240, 30)); TemplateTreeSearchManager.getInstance().registerTreeSearchStatusChangeListener(this); } @@ -100,63 +83,24 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS contentPane.add(searchPane, SEARCH_PANE); contentPane.add(toolbarPane, TOOLBAR_PANE); cardLayout.show(contentPane, TOOLBAR_PANE); + contentPane.setBorder(new ScaledEmptyBorder(4, 8, 4, 8)); } private void initSearchPane() { - searchPane = new JPanel(FRGUIPaneFactory.createBorderLayout()); - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR)); - searchPane.setBackground(Color.WHITE); - // 左侧搜索图标 - UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/search")); - searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0)); - searchLabel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - // do nothing - } - }); - // 中间输入框 - initSearchTextField(); - // 右侧返回图标 - UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear")); - returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return")); - returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11)); - returnLabel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - TemplateTreeSearchManager.getInstance().outOfSearchMode(); - TemplateTreePane.getInstance().refreshDockingView(); - } - }); - searchPane.add(searchLabel, BorderLayout.WEST); - searchPane.add(searchTextField, BorderLayout.CENTER); - searchPane.add(returnLabel, BorderLayout.EAST); - } + searchPane = new FineSearchPane(); + searchPane.setPlaceholder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Search_Press_Enter_For_Search")); - private void initSearchTextField() { - searchTextField = new UITextField(){ - @Override - public Insets getInsets() { - return new Insets(2, 4, 0, 4); - } - }; - searchTextField.setBorderPainted(false); - searchTextField.setPlaceholder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Search_Press_Enter_For_Search")); - searchTextField.addFocusListener(new FocusListener() { - @Override - public void focusGained(FocusEvent e) { - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.NORMAL_BLUE)); - searchPane.repaint(); - } + initSearchTextFieldListener(); - @Override - public void focusLost(FocusEvent e) { - searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR)); - searchPane.repaint(); - } + searchPane.addClearActionListener(e -> { + TemplateTreeSearchManager.getInstance().outOfSearchMode(); + TemplateTreePane.getInstance().refreshDockingView(); }); - this.searchTextField.getDocument().addDocumentListener(new DocumentListener() { + } + + private void initSearchTextFieldListener() { + searchPane.addDocumentListener(new DocumentListener() { @Override public void insertUpdate(DocumentEvent e) { } @@ -170,11 +114,11 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS public void changedUpdate(DocumentEvent e) { } }); - this.searchTextField.addKeyListener(enterPressed); + searchPane.addKeyListener(enterPressed); } private void dealWithTextChange() { - if (StringUtils.isEmpty(searchTextField.getText()) && TemplateTreeSearchManager.getInstance().isInSearchMode()) { + if (StringUtils.isEmpty(searchPane.getText()) && TemplateTreeSearchManager.getInstance().isInSearchMode()) { // 如果是搜索模式下，看作是用户删除输入框文字，仅复原TemplateTreePane TemplateTreeSearchManager.getInstance().restoreTreePane(); TemplateTreePane.getInstance().refreshDockingView(); @@ -196,7 +140,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS } public void setPlaceHolder(String placeHolder) { - this.searchTextField.setPlaceholder(placeHolder); + this.searchPane.setPlaceholder(placeHolder); } /** @@ -208,10 +152,11 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS public void updateTreeSearchChange(TreeSearchStatusChangeEvent event) { TreeSearchStatus treeSearchStatus = event.getTreeSearchStatus(); if (treeSearchStatus == TreeSearchStatus.NOT_IN_SEARCH_MODE) { - this.searchTextField.setText(StringUtils.EMPTY); + searchPane.setText(StringUtils.EMPTY); switchPane(TOOLBAR_PANE); } else { switchPane(SEARCH_PANE); + searchPane.requestFocus(); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java b/designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java index c6dc9a9b66..bff60f71d2 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java @@ -1,14 +1,12 @@ package com.fr.design.mainframe.platform; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.i18n.Toolkit; import com.fr.design.utils.BrowseUtils; import com.fr.general.CloudCenter; -import com.fr.log.FineLoggerFactory; -import java.awt.Desktop; import java.awt.event.ActionEvent; -import java.net.URI; /** * 帮助-服务平台 @@ -20,7 +18,7 @@ import java.net.URI; public class ServicePlatformAction extends UpdateAction { public ServicePlatformAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Service_Platform_Title")); - this.setSmallIcon("/com/fr/design/images/platform/platform", false); + this.setSmallIcon(new LazyIcon("servicePlatform")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ColorFillStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ColorFillStylePane.java index 823dd6ff3a..d835e2f372 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ColorFillStylePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ColorFillStylePane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.predefined.ui.detail; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.base.ChartColorMatching; import com.fr.base.ChartPreStyleConfig; import com.fr.base.Utils; @@ -7,14 +8,11 @@ import com.fr.chart.base.ChartConstants; import com.fr.config.predefined.ColorFillStyle; import com.fr.config.predefined.PredefinedColorStyle; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.constants.LayoutConstants; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.icombobox.ColorSchemeComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.background.gradient.FixedGradientBarNoTheme; import com.fr.design.style.color.ColorAdjustPane; import com.fr.stable.StringUtils; @@ -158,14 +156,7 @@ public class ColorFillStylePane extends BasicBeanPane { } protected JPanel getContentPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double e = 155; - double[] columnSize = {f, e}; - double[] rowSize = {p, p, p}; - - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(contentPaneComponents(), rowSize, columnSize, 12, LayoutConstants.VGAP_LARGE); - return panel; + return FineLayoutBuilder.compatibleTableLayout(10, contentPaneComponents(), new double[]{1.2, 3}); } protected Component[][] contentPaneComponents() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java index 7ff83c7b19..3aa21c2908 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.theme; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.GraphHelper; import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.TemplateThemeConfig; @@ -37,9 +39,9 @@ import java.awt.event.MouseEvent; * Created by Starryi on 2021/8/13 */ public class TemplateThemeBlock extends JPanel { - public static final int INFO_HEIGHT = 30; - public static final int CONTENT_WIDTH = ThemeThumbnail.WIDTH; - public static final int CONTENT_HEIGHT = ThemeThumbnail.HEIGHT + INFO_HEIGHT; + public static final int INFO_HEIGHT = FineUIScale.scale(30); + public static final int CONTENT_WIDTH = FineUIScale.scale(ThemeThumbnail.WIDTH); + public static final int CONTENT_HEIGHT = FineUIScale.scale(ThemeThumbnail.HEIGHT) + INFO_HEIGHT; private static final Color HOVERING_BORDER_COLOR = new Color(65, 155, 249); private final String name; @@ -108,7 +110,7 @@ public class TemplateThemeBlock extends JPanel { JPanel infoPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); infoPane.setPreferredSize(new Dimension(CONTENT_WIDTH, INFO_HEIGHT)); infoPane.setBackground(Color.WHITE); - infoPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L7,0,IntervalConstants.INTERVAL_L7)); + infoPane.setBorder(new ScaledEmptyBorder(0, IntervalConstants.INTERVAL_L7,0,IntervalConstants.INTERVAL_L7)); UILabel titleLabel = new UILabel(name); titleLabel.setToolTipText(name); @@ -151,7 +153,7 @@ public class TemplateThemeBlock extends JPanel { private void addProfileButton(JPanel panel) { profileButton = new UILabel(profileIcon); - profileButton.setPreferredSize(new Dimension(24, 24)); + profileButton.setPreferredSize(FineUIScale.scale(new Dimension(24, 24))); panel.add(profileButton, BorderLayout.EAST); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java index 5432109dc0..2d43c3f76b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.theme; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.FineColorSynchronizer; import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.TemplateThemeConfig; @@ -84,7 +86,7 @@ public abstract class TemplateThemeEditorPane extends J private void initializePane() { setLayout(new BorderLayout(0, 0)); - setPreferredSize(new Dimension(RIGHT_PANE_WIDTH, RIGHT_PANE_HEIGHT)); + setPreferredSize(FineUIScale.scale(new Dimension(RIGHT_PANE_WIDTH, RIGHT_PANE_HEIGHT))); JPanel nameEditPane = createNameEditPane(); add(nameEditPane, BorderLayout.NORTH); @@ -103,7 +105,7 @@ public abstract class TemplateThemeEditorPane extends J nameTextField.setThemeConfig(config); nameTextField.setEditable(false); nameTextField.setEnabled(false); - nameTextField.setPreferredSize(new Dimension(165, 20)); + nameTextField.setPreferredSize(FineUIScale.scale(new Dimension(165, 20))); nameTextField.setNameCheckListener(new AutoCheckTextField.CheckListener() { @Override public void onChecked(String error, boolean valid) { @@ -121,7 +123,7 @@ public abstract class TemplateThemeEditorPane extends J new Component[] { null, nameErrorLabel }, }, new double[] { 20, 20}, new double[] { p, 165}, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_W0); - container.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); + container.setBorder(new ScaledEmptyBorder(5, 0, 0, 0)); return container; } @@ -142,7 +144,7 @@ public abstract class TemplateThemeEditorPane extends J {null, tipLabel}, }, rowSize, columnSize, 18, 7); - content.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + content.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); JPanel borderContainer = new JPanel(new BorderLayout()); borderContainer.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Title"))); @@ -180,7 +182,7 @@ public abstract class TemplateThemeEditorPane extends J container.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Custom_Settings_Title"))); uiTabbedPane = new UITabbedPane(); - uiTabbedPane.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 1)); + uiTabbedPane.setBorder(new ScaledEmptyBorder(10, 5, 10, 1)); container.add(uiTabbedPane, BorderLayout.CENTER); initPluginListener(); return container; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridControlPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridControlPane.java index cdbd6d10f2..f2101b944a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridControlPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridControlPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme; +import com.fine.theme.icon.LazyIcon; import com.fr.base.theme.FormTheme; import com.fr.base.theme.FormThemeConfig; import com.fr.base.theme.ReportTheme; @@ -14,18 +15,15 @@ import com.fr.design.event.ChangeListener; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.i18n.Toolkit; -import com.fr.design.icon.IconPathConstants; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.theme.dialog.TemplateThemeProfileDialog; import com.fr.design.menu.MenuDef; import com.fr.design.menu.ToolBarDef; -import com.fr.general.IOUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.third.javax.annotation.Nullable; import com.fr.transaction.CallBackAdaptor; -import javax.swing.BorderFactory; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JSeparator; @@ -35,8 +33,6 @@ import java.awt.BasicStroke; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.RenderingHints; @@ -99,8 +95,6 @@ public class TemplateThemeGridControlPane extends Basic private void initializePane() { setLayout(FRGUIPaneFactory.createBorderLayout()); - setBorder(BorderFactory.createEmptyBorder(5, 10, 0, 10)); - setPreferredSize(new Dimension(CONTENT_WIDTH, CONTENT_HEIGHT)); add(createActionsContainer(), BorderLayout.NORTH); @@ -177,10 +171,8 @@ public class TemplateThemeGridControlPane extends Basic private JPanel createActionsContainer() { JPanel content = FRGUIPaneFactory.createBorderLayout_S_Pane(); - content.setPreferredSize(new Dimension(content.getPreferredSize().width, 20)); UIToolbar toolBar = ToolBarDef.createJToolBar(); - toolBar.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); content.add(toolBar, BorderLayout.CENTER); MenuDef addMenuDef = createAddMenuDef(); @@ -210,17 +202,14 @@ public class TemplateThemeGridControlPane extends Basic content.add(setTheme4NewTemplateButton, BorderLayout.EAST); JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane(); - container.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0)); container.add(content, BorderLayout.CENTER); - container.setPreferredSize(new Dimension(container.getPreferredSize().width, 30)); - return container; } private MenuDef createAddMenuDef() { MenuDef menuDef = new MenuDef(Toolkit.i18nText("Fine-Design_Basic_Action_Add")); - menuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH); + menuDef.setIcon(new LazyIcon("add_popup")); menuDef.setRePaint(true); menuDef.addShortCut(new AddThemeAction(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Pane_Create_Light_Theme"), config.getDefaultLightThemeName())); menuDef.addShortCut(new AddThemeAction(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Pane_Create_Dark_Theme"), config.getDefaultDarkThemeName())); @@ -239,7 +228,7 @@ public class TemplateThemeGridControlPane extends Basic setEnabled(initialEnabled); setName(Toolkit.i18nText("Fine-Design_Basic_Remove")); setMnemonic('R'); - setSmallIcon(IOUtils.readIcon(IconPathConstants.TD_REMOVE_ICON_PATH)); + setSmallIcon(new LazyIcon("remove")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java index 8c995874fd..27e5b62e30 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.ScreenResolution; import com.fr.base.theme.FormTheme; import com.fr.base.theme.FormThemeConfig; @@ -12,7 +13,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.event.ChangeEvent; import com.fr.design.event.ChangeListener; import com.fr.design.file.HistoryTemplateListCache; -import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.design.gui.frpane.FineTabbedPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; @@ -73,16 +74,16 @@ public class TemplateThemeGridPagesPane extends JPanel { private void initializePane(@Nullable Window window) { setLayout(new BorderLayout()); - setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10)); + setBorder(new ScaledEmptyBorder(10, 10, 0, 10)); breadcrumbBar = new BreadcrumbBar(); - breadcrumbBar.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); + breadcrumbBar.setBorder(new ScaledEmptyBorder(0, 0, 10, 0)); add(breadcrumbBar, BorderLayout.NORTH); contentPane = new JPanel(); contentPane.setBorder(new CompoundBorder( new TopLineBorder(new Color(0xE0E0E1), 1), - BorderFactory.createEmptyBorder(10, 0, 0, 0))); + new ScaledEmptyBorder(10, 0, 0, 0))); cardLayout = new CardLayout(); contentPane.setLayout(cardLayout); add(contentPane, BorderLayout.CENTER); @@ -276,27 +277,28 @@ public class TemplateThemeGridPagesPane extends JPanel { } public static class TemplateThemeManagingPane extends TemplateThemeGridPagePane { - private final UITabbedPane tabbedPane; + private final FineTabbedPane tabbedPane; public TemplateThemeManagingPane(@Nullable Window window) { setLayout(FRGUIPaneFactory.createBorderLayout()); - tabbedPane = new UITabbedPane(); - tabbedPane.setTabBorderColor(new Color(0xE0E0E1)); - add(tabbedPane, BorderLayout.CENTER); - /// 去除frm - //TemplateThemeGridControlPane formThemesManagerPane = TemplateThemeGridControlPane.createFormThemesManagerPane(window); +// TemplateThemeGridControlPane formThemesManagerPane = TemplateThemeGridControlPane.createFormThemesManagerPane(window); TemplateThemeGridControlPane reportThemesManagerPane = TemplateThemeGridControlPane.createReportThemesManagerPane(window); - /// 去除frm - //tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Form_Tab"), formThemesManagerPane); - tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Report_Tab"), reportThemesManagerPane); + tabbedPane = FineTabbedPane.builder() + /// 去除frm +// .addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Form_Tab"), formThemesManagerPane) + .addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Report_Tab"), reportThemesManagerPane) + .build(); tabbedPane.setSelectedIndex(0); JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); TemplateThemeConfig config = template.getUsingTemplateThemeConfig(); if (config == reportThemesManagerPane.getConfig()) { tabbedPane.setSelectedIndex(0); } + + add(tabbedPane, BorderLayout.CENTER); + } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPane.java index bce8590519..1493eb3b45 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.theme; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.TemplateThemeConfig; import com.fr.design.designer.IntervalConstants; @@ -34,9 +36,9 @@ import java.util.Map; public class TemplateThemeGridPane extends BasicPane { public static final int BLOCK_COUNT_ROW_LINE = 3; public static final int BLOCK_GAP = IntervalConstants.INTERVAL_L1; - public static final int CONTENT_WIDTH = TemplateThemeBlock.CONTENT_WIDTH * BLOCK_COUNT_ROW_LINE + BLOCK_GAP * (BLOCK_COUNT_ROW_LINE - 1) + 10; + public static final int CONTENT_WIDTH = TemplateThemeBlock.CONTENT_WIDTH * BLOCK_COUNT_ROW_LINE + FineUIScale.scale(BLOCK_GAP) * (BLOCK_COUNT_ROW_LINE - 1) + FineUIScale.scale(10); public static final int BLOCK_ROWS_PER_PAGE = 3; - public static final int CONTENT_HEIGHT = Math.min(527, TemplateThemeBlock.CONTENT_HEIGHT * BLOCK_ROWS_PER_PAGE + BLOCK_GAP * (BLOCK_ROWS_PER_PAGE + 1)); + public static final int CONTENT_HEIGHT = Math.min(FineUIScale.scale(527), TemplateThemeBlock.CONTENT_HEIGHT * BLOCK_ROWS_PER_PAGE + FineUIScale.scale(BLOCK_GAP) * (BLOCK_ROWS_PER_PAGE + 1)); public static final int ASYNC_FETCH_THEME_THREAD_COUNT = 10; private final AsyncThemeFetcher asyncThemeFetcher; @@ -72,7 +74,7 @@ public class TemplateThemeGridPane extends BasicPane { setLayout(FRGUIPaneFactory.createBorderLayout()); setPreferredSize(new Dimension(CONTENT_WIDTH, CONTENT_HEIGHT)); - contentListPane.setBorder(BorderFactory.createEmptyBorder(BLOCK_GAP, 0, BLOCK_GAP, 10)); + contentListPane.setBorder(new ScaledEmptyBorder(BLOCK_GAP, 0, BLOCK_GAP, 10)); contentListPane.setLayout(new GridLayout(0, BLOCK_COUNT_ROW_LINE, BLOCK_GAP, BLOCK_GAP)); fillContentListPane(); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemePreviewPane.java index c302cf1ad8..68029f4765 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemePreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemePreviewPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme; +import com.fine.theme.utils.FineUIScale; import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.settings.ThemeThumbnail; @@ -22,8 +23,8 @@ import java.awt.image.BufferedImage; */ public abstract class TemplateThemePreviewPane extends JPanel implements CallbackEvent, ThemePreviewed { private JPanel parent; - public static final int PREVIEW_WIDTH = 627; - public static final int PREVIEW_HEIGHT = 532; + public static final int PREVIEW_WIDTH = FineUIScale.scale(627); + public static final int PREVIEW_HEIGHT = FineUIScale.scale(532); public void setParent(JPanel parent) { this.parent = parent; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java index c79ccd9090..4e8273161f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.theme; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.TemplateThemeConfig; import com.fr.base.theme.settings.ThemeThumbnail; @@ -71,8 +73,8 @@ public abstract class TemplateThemeProfilePane extends } private void initializePane() { - setLayout(new BorderLayout(5, 0)); - setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 6)); + setLayout(new BorderLayout(FineUIScale.scale(5), 0)); + setBorder(new ScaledEmptyBorder(10, 10, 0, 10)); add(createLeftPane(), BorderLayout.CENTER); add(createRightPane(), BorderLayout.EAST); } @@ -84,14 +86,14 @@ public abstract class TemplateThemeProfilePane extends private JPanel createLeftPane() { JPanel titleContainer = FRGUIPaneFactory.createBorderLayout_S_Pane(); - titleContainer.setPreferredSize(new Dimension(LEFT_TITLE_PANE_WIDTH, LEFT_TITLE_PANE_HEIGHT)); + titleContainer.setPreferredSize(FineUIScale.scale(new Dimension(LEFT_TITLE_PANE_WIDTH, LEFT_TITLE_PANE_HEIGHT))); JPanel previewContainer = FRGUIPaneFactory.createBorderLayout_S_Pane(); - previewContainer.setBorder(BorderFactory.createEmptyBorder(5, 4, 10, 4)); + previewContainer.setBorder(new ScaledEmptyBorder(5, 4, 10, 4)); titleContainer.add(createTitlePane(), BorderLayout.NORTH); titleContainer.add(previewContainer, BorderLayout.CENTER); themePreviewPane = createThemePreviewPane(); - themePreviewPane.setPreferredSize(new Dimension(PREVIEW_PANE_WIDTH, PREVIEW_PANE_HEIGHT)); + themePreviewPane.setPreferredSize(FineUIScale.scale(new Dimension(PREVIEW_PANE_WIDTH, PREVIEW_PANE_HEIGHT))); previewContainer.add(themePreviewPane, BorderLayout.CENTER); return titleContainer; @@ -377,7 +379,7 @@ public abstract class TemplateThemeProfilePane extends */ protected JPanel createTitlePane() { JPanel titlePane = new JPanel(); - titlePane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5)); + titlePane.setBorder(new ScaledEmptyBorder(0, 5, 0, 5)); titlePane.setLayout(new BorderLayout()); leftTitleLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Preview_Pane_Title")); leftTitlePromptLabel = new UILabel(Toolkit.i18nText("Fine-Design_Theme_Control_PC_Prompt")); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java index b3362e5fb0..f89e4104b0 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java @@ -1,19 +1,19 @@ package com.fr.design.mainframe.theme; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.settings.ThemedCellStyle; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.cell.CellRectangleStylePreviewPane; import com.fr.design.file.HistoryTemplateListCache; -import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerBean; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; -import com.fr.general.IOUtils; -import javax.swing.BorderFactory; import javax.swing.DefaultListModel; import javax.swing.Icon; import javax.swing.JList; @@ -54,7 +54,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane, Serializable { - private static final Icon selectedMarkIcon = IOUtils.readIcon("/com/fr/design/form/images/marked.png"); - + private static final Icon SELECTEDMARK_ICON = new LazyIcon("selectedMark"); private final CellRectangleStylePreviewPane previewArea; private boolean selected = false; public RadioButtonListCellRangeRenderer(boolean supportInnerBorder) { super(); - setLayout(new BorderLayout(5, 0)); - setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0)); + setLayout(new BorderLayout()); + setBorder(new ScaledEmptyBorder(5, 0, 5, 0)); previewArea = new CellRectangleStylePreviewPane(supportInnerBorder); add(previewArea, BorderLayout.CENTER); } @@ -147,7 +146,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane extends TemplateThemeDialog { public static TemplateThemeProfilePane currentVisibleProfilePane; - public static final int CONTENT_WIDTH = 1010; - public static final int CONTENT_HEIGHT = 542; + public static final int CONTENT_WIDTH = FineUIScale.scale(1010); + public static final int CONTENT_HEIGHT = FineUIScale.scale(542); private final TemplateThemeProfilePane profilePane; public TemplateThemeProfileDialog(Window parent, TemplateThemeProfilePane profilePane) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/CellStyleListEditPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/CellStyleListEditPane.java index 3f198f230a..5e569afbf5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/CellStyleListEditPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/CellStyleListEditPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.edit; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.settings.ThemedCellStyle; import com.fr.base.theme.settings.ThemedCellStyleList; import com.fr.design.actions.UpdateAction; @@ -56,7 +57,7 @@ public class CellStyleListEditPane extends JListControlPane { public CellStyleListEditPane() { super(); - setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5)); + setBorder(new ScaledEmptyBorder(10, 5, 10, 5)); addModNameActionListener(new ModNameActionListener() { public void nameModed(int index, String oldName, String newName) { if (ComparatorUtils.equals(oldName, newName) || ComparatorUtils.equals(newName, NameInspector.ILLEGAL_NAME_HOLDER)) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ChartStyleEditPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ChartStyleEditPane.java index 4d75622aed..48ff8b21e1 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ChartStyleEditPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ChartStyleEditPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.edit; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.settings.ThemedChartStyle; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.MultiTabPane; @@ -34,7 +35,7 @@ public class ChartStyleEditPane extends MultiTabPane { @Override protected void initLayout() { super.initLayout(); - setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/FormBodyStyleEditPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/FormBodyStyleEditPane.java index 1f2089e69d..18f5cfe6e2 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/FormBodyStyleEditPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/FormBodyStyleEditPane.java @@ -1,8 +1,11 @@ package com.fr.design.mainframe.theme.edit; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.settings.ThemedFormBodyStyle; import com.fr.design.designer.IntervalConstants; import com.fr.design.gui.style.ComponentBodyStylePane; +import com.fr.web.component.FineUIShowComponent; import javax.swing.BorderFactory; import javax.swing.JScrollPane; @@ -14,14 +17,14 @@ import javax.swing.ScrollPaneConstants; * Created by Starryi on 2021/8/12 */ public class FormBodyStyleEditPane extends JScrollPane { - public static final int LABEL_WIDTH = 60; - public static final int SETTING_WIDTH = 193; + public static final int LABEL_WIDTH = FineUIScale.scale(60); + public static final int SETTING_WIDTH = FineUIScale.scale(193); private final ComponentBodyStylePane bodyStylePane; public FormBodyStyleEditPane() { bodyStylePane = new ComponentBodyStylePane(LABEL_WIDTH, SETTING_WIDTH); - bodyStylePane.setBorder(BorderFactory.createEmptyBorder( + bodyStylePane.setBorder(new ScaledEmptyBorder( IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1, diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ReportBodyStyleEditPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ReportBodyStyleEditPane.java index 4a14460255..70a3b19a95 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ReportBodyStyleEditPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ReportBodyStyleEditPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.edit; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.settings.ThemedReportBodyStyle; import com.fr.design.designer.IntervalConstants; import com.fr.design.gui.ilable.UILabel; @@ -34,12 +35,12 @@ public class ReportBodyStyleEditPane extends JScrollPane { JPanel uiLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); uiLabelPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Background_Fill")), BorderLayout.NORTH); - uiLabelPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + uiLabelPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); JPanel backgroundLabeledPane = TableLayoutHelper.createCommonTableLayoutPane( new Component[][]{ new Component[] { uiLabelPane, backgroundPane } }, new double[] { p }, new double[] { LABEL_WIDTH, SETTING_WIDTH}, IntervalConstants.INTERVAL_L1 ); - backgroundLabeledPane.setBorder(BorderFactory.createEmptyBorder( + backgroundLabeledPane.setBorder(new ScaledEmptyBorder( IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1, diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/background/BackgroundSettingPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/background/BackgroundSettingPane.java index 667c601141..18d9c093b7 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/background/BackgroundSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/background/BackgroundSettingPane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.theme.edit.background; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.beans.BasicBeanPane; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.icombobox.UIComboBox; @@ -71,8 +73,8 @@ public class BackgroundSettingPane extends BasicBeanPane { JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane( new Component[][]{new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Fill")), headCombobox}}, TableLayoutHelper.FILL_NONE, 33, 5); - headCombobox.setPreferredSize(new Dimension(160, 20)); - jPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10)); + headCombobox.setPreferredSize(FineUIScale.scale(new Dimension(160, 20))); + jPanel.setBorder(new ScaledEmptyBorder(5, 10, 5, 10)); return jPanel; } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java index 846da26491..9865321987 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java @@ -4,10 +4,8 @@ import com.fr.base.CellBorderStyle; import com.fr.base.Style; import com.fr.base.theme.settings.ThemedCellStyle; import com.fr.design.cell.CellRectangleStylePreviewPane; -import com.fr.design.constants.UIConstants; import com.fr.design.dialog.AttrScrollPane; import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.BasicScrollPane; import com.fr.design.dialog.MultiTabPane; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.frpane.AttributeChangeListener; @@ -23,7 +21,6 @@ import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Dimension; -import java.awt.GridLayout; import java.util.ArrayList; import java.util.List; @@ -44,10 +41,6 @@ public class CellStyleEditPane extends MultiTabPane { public CellStyleEditPane() { super(); - tabPane.setOneLineTab(true); - tabPane.setDrawLine(false); - tabPane.setBorder(BorderFactory.createLineBorder(UIConstants.SHADOW_GREY)); - tabPane.setLayout(new GridLayout(1, 3, 0, 0)); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/AbstractChartStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/AbstractChartStylePane.java index 801e7e0ab0..547b5c1d25 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/AbstractChartStylePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/AbstractChartStylePane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.theme.edit.chart; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.theme.settings.ThemedChartStyle; import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; @@ -30,11 +32,11 @@ public abstract class AbstractChartStylePane extends BasicPane { protected void initPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); double labelWidth = 90; - double totalWidth = 155; + double totalWidth = 190; double p = TableLayout.PREFERRED; double[] columnSize = {labelWidth, totalWidth}; JPanel gapTableLayoutPane = TableLayoutHelper.createGapTableLayoutPane(getComponent(), getRows(p), columnSize, 5, LayoutConstants.VGAP_LARGE); - gapTableLayoutPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); + gapTableLayoutPane.setBorder(new ScaledEmptyBorder(0, 10, 0, 0)); UIScrollPane rightTopPane = new UIScrollPane(gapTableLayoutPane); rightTopPane.setBorder(BorderFactory.createEmptyBorder()); this.add(rightTopPane, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java index fb1e3660b9..1d1967ad3c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe.theme.edit.chart; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.FRContext; import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; @@ -54,8 +54,8 @@ public class ChartFontPane extends BasicPane { private void initState() { fontNameComboBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report()); fontSizeComboBox = new UIComboBox(FONT_SIZES); - bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png")); - italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png")); + bold = new UIToggleButton(new LazyIcon("bold")); + italic = new UIToggleButton(new LazyIcon("italic")); fontColor = getColorButton(); } @@ -65,11 +65,10 @@ public class ChartFontPane extends BasicPane { protected void initComponents() { Component[] components = new Component[]{ - fontColor, italic, bold + fontSizeComboBox, fontColor, italic, bold }; - JPanel buttonPane = new JPanel(new BorderLayout()); - buttonPane.add(fontSizeComboBox, BorderLayout.CENTER); - buttonPane.add(GUICoreUtils.createFlowPane(components, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST); + JPanel buttonPane = new JPanel(); + buttonPane.add(GUICoreUtils.createFlowPane(components, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE)); this.setLayout(new BorderLayout()); this.add(getContentPane(buttonPane), BorderLayout.CENTER); @@ -79,7 +78,7 @@ public class ChartFontPane extends BasicPane { protected JPanel getContentPane(JPanel buttonPane) { double labelWidth = 90; - double totalWidth = 155; + double totalWidth = 190; double p = TableLayout.PREFERRED; double[] rows = {p, p, p}; double[] columnSize = {labelWidth, totalWidth}; @@ -90,7 +89,7 @@ public class ChartFontPane extends BasicPane { new Component[]{null, buttonPane} }; - return TableLayoutHelper.createGapTableLayoutPane(components, rows, columnSize, 5, LayoutConstants.VGAP_LARGE); + return TableLayoutHelper.createGapTableLayoutPane(components, rows, columnSize, 5, 0); } public String getUILabelText() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java index c94dd6ef22..8892b0d0d4 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.edit.chart; +import com.fine.theme.utils.FineUIScale; import com.fr.base.theme.settings.ThemedChartStyle; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIColorButton; @@ -35,6 +36,11 @@ public class ChartLabelStylePane extends AbstractChartStylePane { public String getUILabelText() { return Toolkit.i18nText("Fine-Design_Chart_Label_Character"); } + + @Override + public Dimension getPreferredSize() { + return new Dimension(super.getPreferredSize().width, FineUIScale.scale(100)); + } }; initListener(); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java index ab5d8a4ecf..063a56ebef 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.edit.ui; +import com.fine.theme.utils.FineUIScale; import com.fr.base.FineColor; import com.fr.base.background.ColorBackground; import com.fr.design.event.UIObserver; @@ -29,7 +30,7 @@ import java.util.List; */ public class ColorListPane extends JPanel implements UIObserver { public static final int DEFAULT_COLOR_COUNT = 8; - public static final int DEFAULT_COLOR_SIZE = 16; + public static final int DEFAULT_COLOR_SIZE = FineUIScale.scale(16); public static final int DEFAULT_COLOR_GAP = 3; private final int colorCount; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/LabelUtils.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/LabelUtils.java index 53de406afe..ba4b98f874 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/LabelUtils.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/LabelUtils.java @@ -9,6 +9,8 @@ import javax.swing.plaf.basic.BasicTextAreaUI; import java.awt.Color; import java.awt.Font; +import static com.fine.theme.utils.FineUIConstants.SCALE_FONT_SIZE_12; + /** * @author Starryi * @version 1.0 @@ -20,7 +22,7 @@ public class LabelUtils { } public static UILabel createLabel(String title, Color color) { - return createLabel(title, color, 12); + return createLabel(title, color, SCALE_FONT_SIZE_12); } public static UILabel createLabel(String title, Color color, int size) { UILabel uiLabel = new UILabel(title); @@ -34,7 +36,7 @@ public class LabelUtils { JTextArea tipLabel = new JTextArea(); tipLabel.setUI(new BasicTextAreaUI()); tipLabel.setForeground(color); - Font newFont = FRFont.getInstance(tipLabel.getFont().getFontName(), Font.PLAIN, 12); + Font newFont = FRFont.getInstance(tipLabel.getFont().getFontName(), Font.PLAIN, SCALE_FONT_SIZE_12); tipLabel.setFont(newFont); tipLabel.setBorder(BorderFactory.createEmptyBorder()); tipLabel.setEditable(false); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/TabbedPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/TabbedPane.java index c1c8371674..0b724ae571 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/TabbedPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/TabbedPane.java @@ -46,8 +46,6 @@ public class TabbedPane extends JPanel { cardLayout.show(tabContentPane, names[buttonGroup.getSelectedIndex()]); } }; - buttonGroup.setDrawLine(true); - cardLayout = new CardLayout(); tabContentPane = new JPanel(cardLayout) { @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ChartPreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ChartPreviewPane.java index 2029539aa8..8ac381ae60 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ChartPreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ChartPreviewPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.preview; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartPainter; import com.fr.base.chart.chartdata.CallbackEvent; @@ -28,7 +29,7 @@ public class ChartPreviewPane extends MiddleChartComponent implements ThemePrevi private CallbackEvent callbackEvent; public ChartPreviewPane() { - this.setBorder(BorderFactory.createEmptyBorder(0, 1, 2, 1)); + this.setBorder(new ScaledEmptyBorder(0, 1, 2, 1)); } public void setCallbackEvent(CallbackEvent callbackEvent) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ComponentPreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ComponentPreviewPane.java index cfd2781aa8..d856a4079b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ComponentPreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ComponentPreviewPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.preview; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseUtils; import com.fr.base.Style; import com.fr.base.background.ImageBackground; @@ -59,7 +60,7 @@ public abstract class ComponentPreviewPane extends UINoOpaquePanel implements Th setLayout(new BorderLayout()); if (StringUtils.isNotEmpty(title)) { titlePane = new TitleDemoPane(title); - titlePane.setPreferredSize(new Dimension(517, TITLE_HEIGHT)); + titlePane.setPreferredSize(FineUIScale.scale(new Dimension(517, TITLE_HEIGHT))); container.add(titlePane, BorderLayout.NORTH); } container.add(createContentPane(), BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java index 25a1daee92..31fb418390 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.preview; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseFormula; import com.fr.base.background.ColorBackground; import com.fr.base.theme.FormTheme; @@ -61,7 +62,7 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane { chartContent.setLayout(new BorderLayout()); JPanel columnChartPanel = new UINoOpaquePanel() { public Dimension getPreferredSize() { - return new Dimension(379, 314); + return FineUIScale.scale(new Dimension(379, 314)); } }; columnChartPanel.setLayout(new BorderLayout()); @@ -70,7 +71,7 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane { JPanel pieChartPanel = new UINoOpaquePanel() { public Dimension getPreferredSize() { - return new Dimension(236, 314); + return FineUIScale.scale(new Dimension(236, 314)); } }; pieChartPanel.setLayout(new BorderLayout()); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java index 103b6ca6e0..17471d6290 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.theme.preview; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseFormula; import com.fr.base.background.ColorBackground; import com.fr.base.theme.ReportTheme; @@ -41,11 +42,11 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane exte /** * 整体面板的north部分 */ - protected JPanel tableTopPane = new JPanel(); + protected JPanel tableTopPane = new JPanel(new BorderLayout()); /** * 整体面板 */ @@ -153,7 +156,7 @@ public abstract class AbstractSupportSelectTablePane exte tablePane.setLayout(new BorderLayout()); tablePane.add(tableTopPane, BorderLayout.NORTH); tablePane.add(tableContentPane, BorderLayout.CENTER); - tableContentPane.getEditTable().getColumnModel().getColumn(0).setMaxWidth(50); + tableContentPane.getEditTable().getColumnModel().getColumn(0).setMaxWidth(28); RowSorter> sorter = new TableRowSorter>(model) { @Override public boolean isSortable(int column) { @@ -173,7 +176,6 @@ public abstract class AbstractSupportSelectTablePane exte tableContentPane = new UITableEditorPane<>(model); model.setList(entities); JTable table = tableContentPane.getEditTable(); - table.getTableHeader().setBackground(DEFAULT_HEADER_COLOR); table.getTableHeader().setDefaultRenderer(new HeaderRenderer(tableContentPane.getEditTable())); table.addMouseListener(new MouseAdapter() { @Override @@ -251,6 +253,7 @@ public abstract class AbstractSupportSelectTablePane exte public class HeaderRenderer implements TableCellRenderer { JTableHeader tableHeader; final UICheckBox selectBox; + private boolean ascSort = true; public HeaderRenderer(JTable table) { this.tableHeader = table.getTableHeader(); @@ -264,12 +267,14 @@ public abstract class AbstractSupportSelectTablePane exte int selectColumn = tableHeader.columnAtPoint(e.getPoint()); if (selectColumn == 0) { boolean value = !selectBox.isSelected(); - selectBox.setSelected(value); selectAllOrNull(value); selectCount = value ? table.getRowCount() : 0; + setHeaderStatus(table, value); changeExtraComponentStatus(); tableHeader.repaint(); model.fireTableDataChanged(); + } else { + ascSort = table.getRowSorter().getSortKeys().get(0).getSortOrder() == SortOrder.ASCENDING; } } } @@ -288,13 +293,26 @@ public abstract class AbstractSupportSelectTablePane exte * * @param table */ - public void refreshHeader(JTable table, boolean value) { - selectBox.setSelected(value); + public void refreshHeader(JTable table, boolean isAllSelected) { + setHeaderStatus(table, isAllSelected); int rowHeight = table.getRowHeight(); table.updateUI(); table.setRowHeight(rowHeight); } + public void setHeaderStatus(JTable table, boolean isAllSelected) { + if (isAllSelected) { + selectBox.setSelected(true); + selectBox.setSelectedIcon(new LazyIcon("checkbox_checked")); + } else if (selectCount > 0 && selectCount < table.getRowCount()) { + selectBox.setSelected(true); + selectBox.setSelectedIcon(new LazyIcon("checkbox_part_checked")); + } else { + selectBox.setSelected(false); + selectBox.setSelectedIcon(new LazyIcon("checkbox_unchecked")); + } + } + @Override public Component getTableCellRendererComponent(JTable table, Object value, @@ -306,7 +324,7 @@ public abstract class AbstractSupportSelectTablePane exte String valueStr = (String) value; UILabel label = new UILabel(valueStr); if (needIcon4Head(column)) { - label.setIcon(IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_sort")); + setAscSort(label, column); label.setHorizontalTextPosition(JLabel.LEFT); label.setHorizontalAlignment(SwingConstants.LEFT); } @@ -316,10 +334,24 @@ public abstract class AbstractSupportSelectTablePane exte component.setForeground(tableHeader.getForeground()); component.setBackground(tableHeader.getBackground()); component.setFont(tableHeader.getFont()); - component.setBorder(UIManager.getBorder("TableHeader.cellBorder")); + if (column != 0) { + component.setBorder(UIManager.getBorder("TableHeader.cellBorder")); + } else { + component.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor"))); + } return component; } + private void setAscSort(UILabel label, int column) { + if (column != 0) { + if (ascSort) { + label.setIcon(new LazyIcon("sort_asc")); + } else { + label.setIcon(new LazyIcon("sort_desc")); + } + } + } + } @@ -339,6 +371,7 @@ public abstract class AbstractSupportSelectTablePane exte this.setDefaultEditor(Boolean.class, new BooleanEditor()); this.setDefaultRenderer(Boolean.class, new BooleanRenderer()); this.setDefaultRenderer(UILabel.class, new ToolTipTableCellRenderer()); + this.createTable().getColumnModel().getColumn(0).setCellRenderer(new BooleanRenderer()); } @Override @@ -387,8 +420,8 @@ public abstract class AbstractSupportSelectTablePane exte boolean isSelected, boolean hasFocus, int row, int column) { setSelected((Boolean) table.getValueAt(row, 0)); setUI(getUICheckBoxUI()); - setBorder(BorderFactory.createEmptyBorder()); - setBackground(isSelected ? DEFAULT_SELECT_TABLE_ROW_COLOR : Color.WHITE); + setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor"))); + setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); return this; } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java index 4dd14bce6d..58393a3067 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java @@ -13,7 +13,6 @@ import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrameFileDealerPane; import com.fr.design.mainframe.JTemplate; -import com.fr.design.mainframe.ToolBarNewTemplatePane; import com.fr.design.mainframe.WestRegionContainerPane; import com.fr.design.mainframe.vcs.common.VcsHelper; import com.fr.design.menu.ToolBarDef; @@ -156,7 +155,7 @@ public class FileVersionsPanel extends BasicPane { DesignModeContext.switchTo(isExit ? DesignerMode.NORMAL : DesignerMode.VCS); // MutilTempalteTabPane & NewTemplatePane 是否可点 - ToolBarNewTemplatePane.getInstance().setButtonGray(!isExit); + MultiTemplateTabPane.getInstance().setToolBarEnable(!isExit); JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); if (currentEditingTemplate.isJWorkBook()) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java index 1aacaa9d7b..20d7843034 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java @@ -1,5 +1,9 @@ package com.fr.design.mainframe.vcs.ui; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineRoundBorder; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.svg.IconUtils; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.FineJOptionPane; @@ -32,6 +36,8 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; import static com.fr.design.i18n.Toolkit.i18nText; /** @@ -42,19 +48,19 @@ import static com.fr.design.i18n.Toolkit.i18nText; * Created on 2023/7/5 */ public class RecyclePane extends AbstractSupportSelectTablePane { - public static final Icon ICON_SEARCH = IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_recycle_search"); - public static final Icon ICON_REFRESH = IconUtils.readSVGIcon("/com/fr/design/standard/vcslist/vcs_recycle_restore", IconUtils.ICON_TYPE_NORMAL); - public static final Icon ICON_REFRESH_DISABLE = IconUtils.readSVGIcon("/com/fr/design/standard/vcslist/vcs_recycle_restore", IconUtils.ICON_TYPE_DISABLED); - public static final Icon ICON_DELETE = IconUtils.readSVGIcon("/com/fr/design/standard/vcslist/vcs_recycle_delete", IconUtils.ICON_TYPE_NORMAL); - public static final Icon ICON_DELETE_DISABLE = IconUtils.readSVGIcon("/com/fr/design/standard/vcslist/vcs_recycle_delete", IconUtils.ICON_TYPE_DISABLED); + public static final Icon ICON_SEARCH = new LazyIcon("search"); + public static final Icon ICON_REFRESH = new LazyIcon("refresh"); + public static final Icon ICON_REFRESH_DISABLE = new LazyIcon("refresh").disabled(); + public static final Icon ICON_DELETE = new LazyIcon("remove"); + public static final Icon ICON_DELETE_DISABLE = new LazyIcon("remove").disabled(); private Set listenerSet = new HashSet<>(); protected UITextField searchTextField; - protected UILabel deleteLabel; + protected UILabel deleteLabel = new UILabel(ICON_DELETE); - protected UILabel restoreLabel; + protected UILabel restoreLabel = new UILabel(ICON_REFRESH); private static final int COLUMNS_COUNT = 15; private BasicDialog dialog; @@ -110,32 +116,40 @@ public class RecyclePane extends AbstractSupportSelectTablePane tableTopPane = new JPanel(); tableTopPane.setLayout(new BorderLayout()); JPanel leftPane = new JPanel(); - JPanel rightPane = new JPanel(); + JPanel rightPane = new JPanel(new BorderLayout()); //左边面板,包含搜索icon+搜索框 if (isNeedSearch()) { searchTextField = new UITextField(); searchTextField.setPlaceholder(Toolkit.i18nText("Fine-Design_Vcs_Start_Search")); searchTextField.setColumns(COLUMNS_COUNT); - leftPane.add(new UILabel(ICON_SEARCH)); - leftPane.add(searchTextField); + UILabel searchLabel = new UILabel(ICON_SEARCH); + searchLabel.setBorder(new ScaledEmptyBorder(0, 4, 0, 4)); + searchTextField.setBorder(null); + leftPane = row(cell(searchLabel), cell(searchTextField).weight(1)).with(it -> { + it.setBorder(new FineRoundBorder()); + it.setOpaque(true); + it.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + }).getComponent(); + tableTopPane.add(leftPane, BorderLayout.EAST); } //右边面板，包括还原按钮+删除按钮 + restoreLabel.setVisible(false); + deleteLabel.setVisible(false); if (isNeedRestore()) { - restoreLabel = new UILabel(ICON_REFRESH); + restoreLabel.setVisible(true); restoreLabel.setCursor(new Cursor(Cursor.HAND_CURSOR)); restoreLabel.setDisabledIcon(ICON_REFRESH_DISABLE); restoreLabel.setEnabled(false); rightPane.add(restoreLabel); } if (isNeedDelete()) { - deleteLabel = new UILabel(ICON_DELETE); + deleteLabel.setVisible(true); deleteLabel.setCursor(new Cursor(Cursor.HAND_CURSOR)); deleteLabel.setDisabledIcon(ICON_DELETE_DISABLE); deleteLabel.setEnabled(false); rightPane.add(deleteLabel); } - tableTopPane.add(leftPane, BorderLayout.EAST); - tableTopPane.add(rightPane, BorderLayout.WEST); + tableTopPane.add(row(8, cell(restoreLabel), cell(deleteLabel)).getComponent(), BorderLayout.WEST); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecycleSettingPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecycleSettingPane.java index 0653aad05f..65549bc1a9 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecycleSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecycleSettingPane.java @@ -1,7 +1,9 @@ package com.fr.design.mainframe.vcs.ui; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.utils.FineUIScale; import com.fr.design.dialog.BasicPane; -import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.design.gui.frpane.FineTabbedPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; @@ -49,35 +51,32 @@ public class RecycleSettingPane extends BasicPane { private void init() { this.setLayout(new BorderLayout()); - UITabbedPane tabbedPane = new UITabbedPane(); //回收站内容 JPanel recyclePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); UIScrollPane recycleScrollPane = patchScroll(recyclePane); - tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Vcs_Recycle_Content"), recycleScrollPane); recyclePane.add(new RecyclePane()); //通用设置 JPanel settingPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); UIScrollPane settingScrollPane = patchScroll(settingPane); - tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Carton_General_Settings"), settingScrollPane); settingPane.add(createSchedulePane()); + + FineTabbedPane tabbedPane = FineTabbedPane.builder() + .addTab(Toolkit.i18nText("Fine-Design_Vcs_Recycle_Content"), recycleScrollPane) + .addTab(Toolkit.i18nText("Fine-Design_Basic_Carton_General_Settings"), settingScrollPane) + .withHeadRatio(0.3f).build(); this.add(tabbedPane, BorderLayout.CENTER); } private JPanel createSchedulePane() { - JPanel schedulePane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, VerticalFlowLayout.TOP, 0, 0); - JPanel spinnerPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); - JPanel buttonPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); - spinnerPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Recycle_Schedule"))); spinner = new UISpinner(MIN_VALUE, MAX_VALUE, STEP, DEFAULT_VALUE); spinner.setValue(VcsConfig.getInstance().getV2CleanRecycleInterval()); - spinnerPane.add(spinner); - spinnerPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Recycle_Schedule_Day"))); - schedulePane.add(spinnerPane); button = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Save")); initButtonListener(); - buttonPane.add(button); - schedulePane.add(buttonPane); - return schedulePane; + return Layouts.column(10, Layouts.row(Layouts.cell(new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Recycle_Schedule"))) + , Layouts.cell(spinner).with(it -> it.setPreferredSize(new Dimension(FineUIScale.scale(100), -1))) + , Layouts.fix(6) + , Layouts.cell(new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Recycle_Schedule_Day"))), Layouts.flex()), + Layouts.row(Layouts.cell(button), Layouts.flex())).getComponent(); } private void initButtonListener() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java index bfb10e2057..7cfb7bd550 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java @@ -1,11 +1,11 @@ package com.fr.design.mainframe.vcs.ui; +import com.fine.theme.light.ui.FineTableHeaderUI; import com.fr.general.GeneralUtils; import com.fr.stable.StringUtils; import javax.swing.JTable; import javax.swing.JLabel; -import javax.swing.table.DefaultTableCellRenderer; import java.awt.*; @@ -16,7 +16,7 @@ import java.awt.*; * @since 11.0 * Created on 2023/7/21 */ -public class ToolTipTableCellRenderer extends DefaultTableCellRenderer { +public class ToolTipTableCellRenderer extends FineTableHeaderUI.TableRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCellRender.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCellRender.java index 952c52a060..d75925d88d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCellRender.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCellRender.java @@ -23,7 +23,7 @@ public class VcsCellRender implements TableCellRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - vcsPanel.setBackground(isSelected ? DEFAULT_SELECT_TABLE_ROW_COLOR : Color.WHITE); + vcsPanel.setOpaque(false); return vcsPanel; } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java index b97de53991..b95b35b7de 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java @@ -1,13 +1,12 @@ package com.fr.design.mainframe.vcs.ui; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.file.TemplateTreePane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; -import com.fr.design.lock.LockInfoUtils; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.vcs.VcsOperatorWorker; @@ -17,10 +16,7 @@ import com.fr.design.mainframe.vcs.common.VcsCloseTemplateHelper; import com.fr.file.FileNodeFILE; import com.fr.file.filetree.FileNode; import com.fr.report.entity.VcsEntity; -import com.fr.report.lock.LockInfoOperator; -import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; -import com.fr.stable.project.ProjectConstants; import com.fr.workspace.WorkContext; import com.fr.workspace.server.vcs.VcsOperator; @@ -50,9 +46,9 @@ public class VcsCenterPane extends VcsNewPane { private UILabel open; private UILabel delete; - private static final Icon MANAGER_ICON = IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_center_manager"); - private static final Icon DELETE_ICON = IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_operator_delete"); - private static final Icon OPEN_ICON = IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_center_open"); + private static final Icon MANAGER_ICON = new LazyIcon("vcs_list"); + private static final Icon DELETE_ICON = new LazyIcon("remove"); + private static final Icon OPEN_ICON = new LazyIcon("openTemplate"); private static final Class[] CLASSES = new Class[]{ Boolean.class, UILabel.class, diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java index 2c8401c94c..ed6290b798 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java @@ -10,7 +10,6 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.iprogressbar.ModernUIProgressBarUI; -import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; @@ -21,7 +20,6 @@ import com.fr.design.mainframe.vcs.VcsExceptionUtils; import com.fr.design.mainframe.vcs.common.VcsHelper; import com.fr.design.utils.BrowseUtils; import com.fr.design.utils.DesignUtils; -import com.fr.design.utils.ThemeUtils; import com.fr.design.widget.FRWidgetFactory; import com.fr.general.FRFont; import com.fr.log.FineLoggerFactory; @@ -29,14 +27,16 @@ import com.fr.stable.StringUtils; import com.fr.workspace.server.vcs.v2.move.VcsMoveService; import com.fr.workspace.server.vcs.v2.move.VcsMoveStrategy; -import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Color; +import java.awt.Cursor; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -44,7 +44,7 @@ import java.awt.event.MouseEvent; import java.util.List; import java.util.concurrent.ExecutionException; -import static javax.swing.JOptionPane.YES_NO_CANCEL_OPTION; +import static com.fine.swing.ui.layout.Layouts.row; import static javax.swing.JOptionPane.YES_OPTION; @@ -61,8 +61,6 @@ public class VcsMovePanel extends BasicPane { .applySize(14) .applyStyle(FRFont.BOLD); - private static final Color BACK_GROUND_COLOR = new Color(202,232,255); - //提示字体的颜色，直接模仿其他面板的写法 private static final Color TIP_COLOR = new Color(51, 51, 52, (int)Math.round(0.5 * 255)); @@ -138,8 +136,7 @@ public class VcsMovePanel extends BasicPane { this.callBack = callBack; this.setLayout(new BorderLayout()); this.parentDialog = parentDialog; - updatePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - updatePane.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 0)); + updatePane = row(10).getComponent(); //初始化顶部的面板 initVcsLabel(updatePane); //initVcsChoosePane @@ -177,7 +174,6 @@ public class VcsMovePanel extends BasicPane { JPanel processPane = new JPanel(); JPanel body = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); PROGRESS_BAR.setStringPainted(true); - PROGRESS_BAR.setUI(new ModernUIProgressBarUI()); PROGRESS_BAR.setBorderPainted(false); PROGRESS_BAR.setOpaque(false); PROGRESS_BAR.setBorder(null); @@ -261,12 +257,10 @@ public class VcsMovePanel extends BasicPane { private void initVcsLabel(JPanel parent) { parent.removeAll(); if (!VcsHelper.getInstance().isLegacyMode()) { - parent.setBackground(ThemeUtils.BACK_COLOR); centerButton = new UIButton(Toolkit.i18nText("Fine-Design_Vcs_Center")); parent.add(centerButton); initVcsCenterListener(); } else { - parent.setBackground(BACK_GROUND_COLOR); vcsUpdateExistLabel = new UILabel(IconUtils.readIcon("/com/fr/design/vcs/vcs_move_icon.svg")); vcsUpdateExistLabel.setText(Toolkit.i18nText("Fine-Design_Vcs_Can_Update")); vcsUpdateFireLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Update")); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java index 11da401226..f0615bfa49 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.vcs.ui; +import com.fine.theme.icon.LazyIcon; import com.fr.base.svg.IconUtils; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.file.HistoryTemplateListCache; @@ -66,9 +67,9 @@ public class VcsNewPane extends RecyclePane { private static final int DOUBLE_CLICK_COUNT = 2; protected VcsOperatorPane operatorPane; - private static final Icon PREVIEW_ICON = IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_operator_preview"); - private static final Icon DELETE_ICON = IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_operator_delete"); - private static final Icon RESTORE_ICON = IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_operator_restore"); + private static final Icon PREVIEW_ICON = new LazyIcon("preview"); + private static final Icon DELETE_ICON = new LazyIcon("remove"); + private static final Icon RESTORE_ICON = new LazyIcon("refresh"); private UILabel restore; private UILabel delete; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java index ce4db1e0d7..c42c96e84c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java @@ -1,17 +1,25 @@ package com.fr.design.mainframe.vcs.ui; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.layout.FRGUIPaneFactory; +import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; - +import javax.swing.UIManager; import java.awt.*; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 操作面板，用于置放常用的操作label @@ -30,11 +38,20 @@ public class VcsOperatorPane extends JPanel { private void init(List iconJComponentMap) { - this.setLayout(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout()); + JPanel panel = new JPanel(); + this.setLayout(new BorderLayout()); + panel.setLayout(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout()); for (JComponent value : iconJComponentMap) { value.setCursor(new Cursor(Cursor.HAND_CURSOR)); - this.add(value); + panel.add(value); } + panel.setOpaque(false); + add(column(flex(), row(fix(6), cell(panel)), flex()) + .with(it -> { + it.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor"))); + it.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + it.setOpaque(true); + }).getComponent()); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsProgressDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsProgressDialog.java index 33b57e1f3e..8427d45569 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsProgressDialog.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsProgressDialog.java @@ -38,7 +38,6 @@ public class VcsProgressDialog{ }; JPanel body = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); progressBar.setStringPainted(true); - progressBar.setUI(new ModernUIProgressBarUI()); progressBar.setBorderPainted(false); progressBar.setOpaque(false); progressBar.setBorder(null); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java index 23cc188edb..30987eb29f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java @@ -1,29 +1,31 @@ package com.fr.design.mainframe.widget; -import com.fr.design.designer.IntervalConstants; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; - -import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; -import java.awt.Component; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fr.design.constants.LayoutConstants.LEFT_WEIGHT; +import static com.fr.design.constants.LayoutConstants.RIGHT_WEIGHT; + /** * Created by plough on 2017/8/7. */ public class BasicPropertyPane extends BasicPane { protected UITextField widgetName; + protected JPanel corePane; public BasicPropertyPane(){ initContentPane(); @@ -31,7 +33,9 @@ public class BasicPropertyPane extends BasicPane { protected void initContentPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + corePane = column(LayoutConstants.VERTICAL_GAP).getComponent(); + this.add(corePane, BorderLayout.CENTER); + widgetName = new UITextField() { protected void initListener() { if (shouldResponseChangeListener()) { @@ -58,17 +62,10 @@ public class BasicPropertyPane extends BasicPane { } }; widgetName.setGlobalName(Toolkit.i18nText("Fine-Design_Report_Basic")); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] rowSize = {p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1}}; - Component[][] components = new Component[][]{ - new Component[]{new UILabel(obtainBasicName()), widgetName}, - }; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); - panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); - this.add(panel, BorderLayout.NORTH); + + corePane.add(row( + cell(new UILabel(obtainBasicName())).weight(LEFT_WEIGHT), cell(widgetName).weight(RIGHT_WEIGHT) + ).getComponent()); } public String obtainBasicName(){ diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java index e6ddd8138c..858f078cf5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java @@ -1,46 +1,62 @@ package com.fr.design.mainframe.widget.accessibles; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; +import com.fr.design.Exception.ValidationException; +import com.fr.design.designer.properties.Decoder; +import com.fr.design.designer.properties.Encoder; +import com.fr.design.dialog.BasicPane; +import com.fr.design.dialog.FineJOptionPane; +import com.fr.design.event.HoverAware; +import com.fr.design.event.UIObserverListener; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.mainframe.widget.editors.ITextComponent; +import com.fr.design.mainframe.widget.editors.TextField; + +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.UIManager; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Component; import java.awt.Dimension; -import java.awt.Graphics2D; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.ArrayList; -import javax.swing.*; -import com.fr.design.constants.UIConstants; -import com.fr.design.dialog.FineJOptionPane; -import com.fr.design.event.UIObserverListener; -import com.fr.design.gui.ibutton.UIButton; - -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.plaf.ButtonUI; -import com.fr.base.BaseUtils; -import com.fr.design.Exception.ValidationException; -import com.fr.design.gui.ibutton.UIButtonUI; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.mainframe.widget.editors.ITextComponent; -import com.fr.design.mainframe.widget.editors.TextField; -import com.fr.design.dialog.BasicPane; -import com.fr.design.designer.properties.Decoder; -import com.fr.design.designer.properties.Encoder; -import com.fr.design.utils.gui.GUIPaintUtils; +import static com.fine.theme.utils.FineUIStyle.STYLE_TEXT; +import static com.fine.theme.utils.FineUIStyle.setStyle; /** + * 编辑器 + * @author anonymous + * @created on 2023/12/13 * @since 6.5.3 */ -public class BaseAccessibleEditor extends BasicPane implements AccessibleEditor { +public class BaseAccessibleEditor extends BasicPane implements AccessibleEditor, HoverAware { + private final Insets defaultInsets = new Insets(0, 6, 0, 6); private ArrayList listeners; private boolean showButton; protected Encoder encoder; private Decoder decoder; private UIButton btPopup; protected ITextComponent txtValue; + private boolean hover; + + private static final String UI_CLASS_ID = "InputUI"; + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } public BaseAccessibleEditor(Encoder enc, Decoder dec, boolean showBtn) { listeners = new ArrayList(); @@ -48,10 +64,29 @@ public class BaseAccessibleEditor extends BasicPane implements AccessibleEditor this.encoder = enc; this.decoder = dec; initComponents(); + initListener(); txtValue.setEditable(dec != null); - ((JComponent) txtValue).setOpaque(true); - ((JComponent) txtValue).setBorder(BorderFactory.createLineBorder(Color.lightGray)); - ((JComponent) txtValue).setBackground(Color.WHITE); + ((JComponent) txtValue).setOpaque(false); + Insets insets = FineUIUtils.getAndScaleUIInsets("InputTextField.borderInsets", defaultInsets); + ((JComponent) txtValue).setBorder(BorderFactory.createEmptyBorder(insets.top, insets.left, insets.bottom, insets.right)); + } + + private void initListener() { + if (txtValue instanceof TextField) { + ((TextField) txtValue).addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent e) { + hover = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + hover = false; + repaint(); + } + }); + } } @Override @@ -77,7 +112,6 @@ public class BaseAccessibleEditor extends BasicPane implements AccessibleEditor } private void initComponents() { - setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1)); txtValue = createTextField(); setLayout(FRGUIPaneFactory.createBorderLayout()); @@ -88,33 +122,13 @@ public class BaseAccessibleEditor extends BasicPane implements AccessibleEditor txtValueActionPerformed(evt); } }); + add((JComponent) txtValue, BorderLayout.CENTER); - setOpaque(false); if (showButton) { - btPopup = new UIButton(){ - @Override - public ButtonUI getUI() { - return new UIButtonUI() { - @Override - protected boolean isPressed(AbstractButton b) { - return model.isArmed() && model.isPressed(); - } - - @Override - protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) { - if (isPressed(b) && b.isPressedPainted()) { - GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), UIConstants.COMBOBOX_BTN_PRESS); - } else if (isRollOver(b)) { - GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_ROLLOVER); - } else if (b.isNormalPainted()) { - GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_NORMAL); - } - } - }; - } - }; + btPopup = new UIButton(); initPopupButton(); + setStyle(btPopup, STYLE_TEXT); btPopup.addActionListener(new ActionListener() { @Override @@ -137,19 +151,15 @@ public class BaseAccessibleEditor extends BasicPane implements AccessibleEditor protected void initPopupButton() { if (!isComboButton()) { - btPopup.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT)); - btPopup.setPreferredSize(new Dimension(20, 20)); + btPopup.setIcon(new LazyIcon("dot")); } else { btPopup.setRolloverEnabled(true); btPopup.setFocusPainted(false); - btPopup.setPreferredSize(new Dimension(15, 19)); btPopup.setBorderPainted(false); btPopup.setContentAreaFilled(false); - btPopup.setMargin(new Insets(0, 0, 0, 0)); - btPopup.setIcon(BaseUtils.readIcon("/com/fr/design/images/form/designer/drop_up.png")); - btPopup.setPressedIcon(BaseUtils.readIcon("/com/fr/design/images/form/designer/drop_down.png")); - btPopup.setRolloverIcon(BaseUtils.readIcon("/com/fr/design/images/form/designer/drop_over.png")); + btPopup.setIcon(new LazyIcon("down_arrow")); } + btPopup.setPreferredSize(FineUIScale.scale(new Dimension(UIManager.getInt("InputButton.width"), UIManager.getInt("InputButton.height")))); } // 有的编辑器是使用下拉框来直接选择的,这时候就把按钮显示成下拉框 @@ -227,4 +237,19 @@ public class BaseAccessibleEditor extends BasicPane implements AccessibleEditor } + @Override + public boolean isHovered() { + return hover; + } + + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + if (btPopup != null) { + btPopup.setEnabled(enabled); + } + if (txtValue instanceof TextField) { + ((TextField) txtValue).setEnabled(enabled); + } + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java index bad481e7af..829292bf40 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java @@ -1,5 +1,17 @@ package com.fr.design.mainframe.widget.editors; +import com.fine.theme.utils.FineUIScale; +import com.fr.data.TableDataSource; +import com.fr.design.data.DesignTableDataManager; +import com.fr.design.data.datapane.TableDataComboBox; +import com.fr.design.editor.editor.Editor; +import com.fr.design.gui.icombobox.LazyComboBox; +import com.fr.design.gui.icombobox.UIComboBoxRenderer; +import com.fr.form.data.DataBinding; + +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; @@ -8,16 +20,6 @@ import java.awt.event.ItemListener; import java.util.ArrayList; import java.util.List; -import javax.swing.*; - -import com.fr.design.data.DesignTableDataManager; -import com.fr.data.TableDataSource; -import com.fr.design.data.datapane.TableDataComboBox; -import com.fr.design.gui.icombobox.UIComboBoxRenderer; -import com.fr.design.gui.icombobox.LazyComboBox; -import com.fr.design.editor.editor.Editor; -import com.fr.form.data.DataBinding; - /** * DataBindingEditor @@ -26,8 +28,6 @@ import com.fr.form.data.DataBinding; * @since 2012-3-29下午5:26:28 */ public class DataBindingEditor extends Editor { - private final static int HORI_GAP = 1; - private final static int VER_GAP = 7; protected TableDataComboBox tableDataComboBox; protected LazyComboBox columnNameComboBox; @@ -62,7 +62,9 @@ public class DataBindingEditor extends Editor { private void initCompontents() { - this.setLayout(new BorderLayout(HORI_GAP, VER_GAP)); + int vgap = UIManager.getInt("DataBindingEditor.vgap"); + int hgap = UIManager.getInt("DataBindingEditor.hgap"); + this.setLayout(new BorderLayout(FineUIScale.scale(hgap), FineUIScale.scale(vgap))); tableDataComboBox = new TableDataComboBox(getTableDataSource()); tableDataComboBox.setPreferredSize(new Dimension(55, 20)); tableDataComboBox.addItemListener(tableDataComboBoxListener); @@ -154,4 +156,9 @@ public class DataBindingEditor extends Editor { public String getIconName() { return "bind_ds_column"; } + + @Override + public String getIconId() { + return "bind_column_popup"; + } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java index 9e3adf672c..76ba836ca1 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java @@ -12,8 +12,8 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.editor.editor.Editor; import com.fr.form.data.DataTableConfig; - -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Dimension; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -81,4 +81,9 @@ public class DataTableEditor extends Editor { return "bind_ds_column"; } + @Override + public String getIconId() { + return "bind_column_popup"; + } + } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/StringEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/StringEditor.java index da7bbc6197..2ba3bb7a13 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/StringEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/StringEditor.java @@ -25,7 +25,6 @@ public class StringEditor extends AbstractPropertyEditor { panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); textField = new UITextField(); panel.add(textField, BorderLayout.CENTER); - textField.setBorder(null); textField.getDocument().addDocumentListener(new DocumentListener() { @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/TextField.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/TextField.java index f6b0b5cef2..0374427f38 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/TextField.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/TextField.java @@ -1,7 +1,5 @@ package com.fr.design.mainframe.widget.editors; -import java.awt.Color; - import com.fr.design.gui.itextfield.UITextField; /** @@ -22,6 +20,6 @@ public class TextField extends UITextField implements ITextComponent { @Override public void setEditable(boolean b) { super.setEditable(b); - setBackground(Color.WHITE); +// setBackground(Color.WHITE); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/menu/DottedSeparator.java b/designer-base/src/main/java/com/fr/design/menu/DottedSeparator.java index 1f5f032770..65dd153b6e 100644 --- a/designer-base/src/main/java/com/fr/design/menu/DottedSeparator.java +++ b/designer-base/src/main/java/com/fr/design/menu/DottedSeparator.java @@ -1,17 +1,18 @@ package com.fr.design.menu; +import com.fine.theme.utils.FineUIUtils; +import com.fr.design.actions.UpdateAction; +import com.fr.design.gui.imenu.UIMenuItem; + +import javax.swing.UIManager; import java.awt.BasicStroke; -import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Graphics2D; +import java.awt.Insets; import java.awt.Stroke; import java.awt.event.ActionEvent; -import com.fr.design.constants.UIConstants; -import com.fr.design.actions.UpdateAction; -import com.fr.design.gui.imenu.UIMenuItem; - /** * 虚线的Separator。 * @author zhou @@ -19,7 +20,7 @@ import com.fr.design.gui.imenu.UIMenuItem; */ public class DottedSeparator extends UpdateAction { - private static Color color = new Color(153, 153, 153); +// private static Color color = new Color(153, 153, 153); public DottedSeparator() { @@ -44,31 +45,32 @@ public class DottedSeparator extends UpdateAction { } private class MenuItem extends UIMenuItem { + + + private final Insets insets; + private final int height; + public MenuItem() { - this.setUI(null); + this.setEnabled(false); this.removeAll(); + insets = FineUIUtils.getAndScaleUIInsets("PopupMenuSeparator.Insets", new Insets(0, 10, 0, 10)); + height = FineUIUtils.getAndScaleInt("PopupMenuSeparator.height", 5); } public void paint(Graphics g) { int w = this.getWidth(); int h = this.getHeight(); Graphics2D g2d = (Graphics2D)g; - g2d.setColor(UIConstants.NORMAL_BACKGROUND); - g2d.fillRect(0, 0, w, h); - g2d.setColor(color); + g2d.setColor(UIManager.getColor("Separator.background")); + Stroke bs = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 2f, new float[] { 3, 1 }, 0); g2d.setStroke(bs); - g2d.drawLine(30, h / 2+1, w-4, h / 2+1); - this.setForeground(color); - super.paint(g); - } - - public Dimension getSize() { - return new Dimension(super.getSize().width, 8); + g2d.drawLine(insets.left, h / 2 + 1, w - insets.right, h / 2 + 1); } + @Override public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, 8); + return new Dimension(super.getPreferredSize().width, height); } } diff --git a/designer-base/src/main/java/com/fr/design/menu/LineSeparator.java b/designer-base/src/main/java/com/fr/design/menu/LineSeparator.java index 45e45fc0d5..bfba89052a 100644 --- a/designer-base/src/main/java/com/fr/design/menu/LineSeparator.java +++ b/designer-base/src/main/java/com/fr/design/menu/LineSeparator.java @@ -1,10 +1,9 @@ package com.fr.design.menu; -import com.fr.design.constants.UIConstants; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.imenu.UIMenuItem; -import java.awt.*; +import java.awt.Color; import java.awt.event.ActionEvent; /** @@ -45,28 +44,7 @@ public class LineSeparator extends UpdateAction{ private class MenuItem extends UIMenuItem { public MenuItem() { - this.setUI(null); this.removeAll(); } - - public void paint(Graphics g) { - int w = this.getWidth(); - int h = this.getHeight(); - Graphics2D g2d = (Graphics2D)g; - g2d.setColor(UIConstants.NORMAL_BACKGROUND); - g2d.fillRect(0, 0, w, h); - g2d.setColor(color); - g2d.drawLine(4, h / 2+1, w-4, h / 2+1); - this.setForeground(color); - super.paint(g); - } - - public Dimension getSize() { - return new Dimension(super.getSize().width, 8); - } - - public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, 8); - } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/menu/MenuDef.java b/designer-base/src/main/java/com/fr/design/menu/MenuDef.java index ee82d256ec..3fece3b671 100644 --- a/designer-base/src/main/java/com/fr/design/menu/MenuDef.java +++ b/designer-base/src/main/java/com/fr/design/menu/MenuDef.java @@ -1,5 +1,8 @@ package com.fr.design.menu; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIStyle; import com.fr.base.svg.IconUtils; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.gui.ibutton.UIButton; @@ -14,9 +17,12 @@ import com.fr.design.mainframe.JTemplate; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.StringUtils; +import javax.swing.Icon; import javax.swing.JMenu; +import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JToolBar; +import javax.swing.MenuElement; import javax.swing.event.MenuEvent; import javax.swing.event.MenuListener; import java.awt.Component; @@ -30,13 +36,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import static com.fine.theme.utils.FineUIStyle.setStyle; + /** * Define Menu. */ public class MenuDef extends ShortCut { private static final int MENU_DEFAULTWDITH = 156; - private static final int BLANK_WIDTH = 30; + private static final int BLANK_WIDTH = 22; private static final Set FORBIDDEN_SET = new HashSet<>(); @@ -64,6 +72,7 @@ public class MenuDef extends ShortCut { protected JPopupMenu popupMenu; protected boolean hasScrollSubMenu; protected boolean isHeadMenu; + protected Icon icon; private String anchor; @@ -115,10 +124,12 @@ public class MenuDef extends ShortCut { this.isHeadMenu = headMenu; } + @Deprecated public String getIconPath() { return iconPath; } + @Deprecated public void setIconPath(String iconPath) { setDisabledIcon(iconPath, false); } @@ -127,12 +138,12 @@ public class MenuDef extends ShortCut { * 设置不可用图标时,注意传递路径问题,若路径为"view_normal.svg",请传递"view",不带后缀 * 读取disable图标的文件名应当为"xxx_disabled.svg",也是项目中的svg命名规范 * 注意必须是svg图标路径才能使用此函数设置正常和禁用状态 - * - * */ + */ public void setDisabledIcon(String iconPath, boolean needDisabled) { this.iconPath = iconPath; this.needDisabled = needDisabled; } + public int getShortCutCount() { return this.shortcutList.size(); } @@ -199,11 +210,10 @@ public class MenuDef extends ShortCut { */ public UIButton createUIButton() { if (createdButton == null) { - if (iconPath != null) { + if (icon != null) { + createdButton = new UIButton(icon); + } else if (iconPath != null) { createdButton = new UIButton(IconUtils.readIcon(iconPath)); - if(needDisabled) { - createdButton.setDisabledIcon(IconUtils.readIcon(iconPath + IconUtils.ICON_TYPE_DISABLED)); - } createdButton.set4ToolbarButton(); } else { createdButton = new UIButton(name); @@ -217,6 +227,29 @@ public class MenuDef extends ShortCut { return createdButton; } + /** + * 添加常规按钮 + * + * @return 按钮 + */ + public UIButton createNormalButton() { + if (createdButton == null) { + if (icon != null) { + createdButton = new UIButton(icon); + } else if (iconPath != null) { + createdButton = new UIButton(IconUtils.readIcon(iconPath)); + } else { + createdButton = new UIButton(name); + } + // 添加名字以作自动化测试 + createdButton.setName(name); + createdButton.setToolTipText(tooltip); + createdButton.addMouseListener(mouseListener); + } + + return createdButton; + } + public void setTooltip(String text) { this.tooltip = text; } @@ -230,7 +263,9 @@ public class MenuDef extends ShortCut { if (createdJMenu == null) { createdJMenu = createJMenu0(); createdJMenu.setMnemonic(this.getMnemonic()); - if (this.iconPath != null) { + if (icon != null) { + createdJMenu.setIcon(icon); + } else if (this.iconPath != null) { createdJMenu.setIcon(IconUtils.readIcon(iconPath)); } MenuListener menuListener = createMenuListener(); @@ -249,7 +284,7 @@ public class MenuDef extends ShortCut { UIMenu createdJMenu; if (hasScrollSubMenu) { createdJMenu = new UIScrollMenu(this.getName()); - } else if (isHeadMenu){ + } else if (isHeadMenu) { createdJMenu = new UIHeadMenu(this.getName()); } else { createdJMenu = new UIMenu(this.getName()); @@ -305,7 +340,13 @@ public class MenuDef extends ShortCut { */ public void updateMenu() { //peter:这个方法用来产生JMenu的孩子控件,但是不update,action. - this.updatePopupMenu(this.createJMenu().getPopupMenu()); + UIMenu jMenu = this.createJMenu(); + JPopupMenu jPopupMenu = jMenu.getPopupMenu(); + this.updatePopupMenu(jPopupMenu); + + if (jMenu instanceof UIHeadMenu) { + setToolBarClientProperty(jPopupMenu); + } //peter:需要设置JMenu的enabled属性. if (createdJMenu != null) { @@ -314,6 +355,32 @@ public class MenuDef extends ShortCut { } } + private void setToolBarClientProperty(JPopupMenu jPopupMenu) { + setStyle(jPopupMenu, FineUIStyle.POPUP_MENU_TOOL_BAR); + + MenuElement[] subElements = jPopupMenu.getSubElements(); + for (MenuElement subElement : subElements) { + if (subElement instanceof JMenu) { + JMenu jMenu = (JMenu) subElement; + Icon icon = jMenu.getIcon(); + if (icon instanceof LazyIcon && jMenu.getSelectedIcon() == null) { + jMenu.setSelectedIcon(((LazyIcon) icon).white()); + } + setStyle(jMenu, FineUIStyle.MENU_TOOL_BAR); + JPopupMenu childPopupMenu = jMenu.getPopupMenu(); + setToolBarClientProperty(childPopupMenu); + } else if (subElement instanceof JMenuItem) { + JMenuItem jMenuItem = (JMenuItem) subElement; + Icon icon = jMenuItem.getIcon(); + if (icon instanceof LazyIcon && jMenuItem.getSelectedIcon() == null) { + jMenuItem.setSelectedIcon(((LazyIcon) icon).white()); + } + setStyle(jMenuItem, FineUIStyle.MENU_ITEM_TOOL_BAR); + } + } + } + + public void updateEnable() { setEnabled(checkEnable()); } @@ -344,8 +411,11 @@ public class MenuDef extends ShortCut { } nec_seperator = false; } - - shortcut.intoJPopupMenu(popupMenu); + if (shortcut instanceof LineSeparator) { + popupMenu.addSeparator(); + } else { + shortcut.intoJPopupMenu(popupMenu); + } isFirstItem = false; } @@ -510,4 +580,7 @@ public class MenuDef extends ShortCut { } + public void setIcon(LazyIcon icon) { + this.icon = icon; + } } diff --git a/designer-base/src/main/java/com/fr/design/menu/NameSeparator.java b/designer-base/src/main/java/com/fr/design/menu/NameSeparator.java index 89d291e543..5ad5581181 100644 --- a/designer-base/src/main/java/com/fr/design/menu/NameSeparator.java +++ b/designer-base/src/main/java/com/fr/design/menu/NameSeparator.java @@ -1,5 +1,12 @@ package com.fr.design.menu; +import com.fine.theme.utils.FineUIScale; +import com.fr.base.GraphHelper; +import com.fr.design.actions.UpdateAction; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.imenu.UIMenuItem; + +import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FontMetrics; @@ -7,13 +14,6 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.event.ActionEvent; -import com.fr.design.constants.UIConstants; -import com.fr.design.gui.ilable.UILabel; - -import com.fr.base.GraphHelper; -import com.fr.design.actions.UpdateAction; -import com.fr.design.gui.imenu.UIMenuItem; - /** * * @author zhou @@ -46,28 +46,18 @@ public class NameSeparator extends UpdateAction { private class MenuItem extends UIMenuItem { public MenuItem(String text) { - this.setUI(null); + this.setEnabled(false); this.removeAll(); this.setLayout(new BorderLayout()); this.add(new CustomerLable(text, UILabel.LEFT), BorderLayout.CENTER); } - public void paint(Graphics g) { - int w = this.getWidth(); - int h = this.getHeight(); - Graphics2D g2d = (Graphics2D)g; - g2d.setColor(UIConstants.NORMAL_BACKGROUND); - g2d.fillRect(0, 0, w, h); - this.setForeground(UIConstants.FONT_COLOR); - super.paint(g); - } - public Dimension getSize() { - return new Dimension(super.getSize().width, 20); + return new Dimension(super.getSize().width, FineUIScale.scale(30)); } public Dimension getPreferredSize() { - return new Dimension(super.getPreferredSize().width, 20); + return new Dimension(super.getPreferredSize().width, FineUIScale.scale(30)); } } @@ -81,15 +71,15 @@ public class NameSeparator extends UpdateAction { int w = this.getWidth(); int h = this.getHeight(); Graphics2D g2d = (Graphics2D)g; - g2d.setColor(UIConstants.FONT_COLOR); + g2d.setColor(getForeground()); FontMetrics fm = GraphHelper.getFontMetrics(this.getFont()); int strwidth = 0; String str = this.getText(); for (int i = 0; i < str.length(); i++) { strwidth = strwidth + fm.charWidth(str.charAt(i)); } + g2d.setColor(UIManager.getColor("Separator.background")); g2d.drawLine(strwidth + 4, h / 2+2, w, h / 2+2); - this.setForeground(UIConstants.FONT_COLOR); super.paint(g); } } diff --git a/designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java b/designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java index 8cc0734371..d35972989c 100644 --- a/designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java +++ b/designer-base/src/main/java/com/fr/design/menu/SnapChatUpdateAction.java @@ -57,7 +57,6 @@ public abstract class SnapChatUpdateAction extends UpdateAction implements SnapC UIMenuItem menuItem = new UIMenuItem(this); // 设置名字用作单元测 menuItem.setName(getName()); - menuItem.setUI(new SnapChatMenuItemUI(this)); object = menuItem; this.putValue(UIMenuItem.class.getName(), object); diff --git a/designer-base/src/main/java/com/fr/design/menu/ToolBarDef.java b/designer-base/src/main/java/com/fr/design/menu/ToolBarDef.java index 8617ded9ba..95d0d995a5 100644 --- a/designer-base/src/main/java/com/fr/design/menu/ToolBarDef.java +++ b/designer-base/src/main/java/com/fr/design/menu/ToolBarDef.java @@ -2,17 +2,15 @@ package com.fr.design.menu; import com.fr.design.actions.UpdateAction; import com.fr.design.file.HistoryTemplateListCache; -import com.fr.design.gui.itoolbar.UIToolBarUI; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.mainframe.JTemplate; -import java.util.Set; import org.jetbrains.annotations.Nullable; -import javax.swing.*; import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Set; /** * Define toolbar.. @@ -26,16 +24,7 @@ public class ToolBarDef { * 一个static的方法生成一个JToolBar */ public static UIToolbar createJToolBar(final Color background) { - UIToolbar toolbar = new UIToolbar(FlowLayout.LEFT, new UIToolBarUI() { - @Override - public void paint(Graphics g, JComponent c) { - Graphics2D g2 = (Graphics2D) g; - g2.setColor(background); - g2.fillRect(0, 0, c.getWidth(), c.getHeight()); - } - }); - toolbar.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); - return toolbar; + return new UIToolbar(); } @@ -43,14 +32,24 @@ public class ToolBarDef { * 一个static的方法生成一个JToolBar */ public static UIToolbar createJToolBar() { - UIToolbar toolbar = new UIToolbar(FlowLayout.LEFT); - toolbar.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); - return toolbar; + return new UIToolbar(FlowLayout.LEFT); } public ToolBarDef() { } + /** + * 插入工具按钮项 + * + * @param index 插入的位置 + * @param shortCut 工具按钮信息 + */ + public void insertShortCut(int index, ShortCut shortCut) { + int size = this.shortcutList.size(); + index = Math.min(index, size); + this.shortcutList.add(index, shortCut); + } + public int getShortCutCount() { return this.shortcutList.size(); } diff --git a/designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java b/designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java index 8e5c3ff404..120535d313 100644 --- a/designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java +++ b/designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java @@ -1,30 +1,31 @@ package com.fr.design.notification.ui; -import com.fr.base.svg.IconUtils; -import com.fr.design.constants.UIConstants; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.notification.NotificationCenter; -import com.fr.general.IOUtils; + import java.awt.BorderLayout; -import java.awt.Dimension; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.theme.utils.FineUIStyle.setStyle; + public class NotificationCenterPane extends BasicPane { private static NotificationCenterPane notificationCenterPane = new NotificationCenterPane(); private static UIButton notificationCenterButton; private NotificationCenterPane() { - setPreferredSize(new Dimension(24, 24)); setLayout(new BorderLayout()); + setOpaque(false); notificationCenterButton = new UIButton(); - notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification")); + notificationCenterButton.setIcon(new LazyIcon("notification")); notificationCenterButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Show_Notification")); notificationCenterButton.set4ToolbarButton(); - notificationCenterButton.setRolloverEnabled(false); + setStyle(notificationCenterButton, FineUIStyle.STYLE_TEXT); this.add(notificationCenterButton); notificationCenterButton.addMouseListener(new MouseAdapter() { @Override @@ -33,7 +34,6 @@ public class NotificationCenterPane extends BasicPane { notificationCenterDialog.showDialog(); } }); - this.setBackground(UIConstants.TEMPLATE_TAB_PANE_BACKGROUND); } public static NotificationCenterPane getNotificationCenterPane() { @@ -42,9 +42,9 @@ public class NotificationCenterPane extends BasicPane { public void refreshButton() { if (NotificationCenter.getInstance().getNotificationsCount() > 0) { - notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification_dot.svg")); + notificationCenterButton.setIcon(new LazyIcon("notification_dot")); } else { - notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification")); + notificationCenterButton.setIcon(new LazyIcon("notification")); } } diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java index 22211acff1..85c7c93af3 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java @@ -1,5 +1,6 @@ package com.fr.design.parameter; +import com.fine.theme.icon.LazyIcon; import com.fr.base.Parameter; import com.fr.base.ParameterConfig; import com.fr.design.gui.controlpane.JListControlPane; @@ -57,7 +58,10 @@ public class ParameterArrayPane extends JListControlPane { */ public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameableSelfCreator(Toolkit.i18nText("Fine-Design_Basic_Engine_Parameter_Name"), Parameter.class, ParameterPane.class) { + new NameableSelfCreator(Toolkit.i18nText("Fine-Design_Basic_Engine_Parameter_Name"), + new LazyIcon("param"), + Parameter.class, + ParameterPane.class) { public Parameter createNameable(UnrepeatedNameHelper helper) { // 返回参数设置面板. return new Parameter(helper.createUnrepeatedName(DEFAULT_PARAMETER_NAME_PREFIX)); diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterDesignerProvider.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterDesignerProvider.java index efafa7cb2e..12f4707032 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterDesignerProvider.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterDesignerProvider.java @@ -54,7 +54,12 @@ public interface ParameterDesignerProvider { return 0; } - JPanel[] toolbarPanes4Form(); + /** + * 参数界面工具栏 + * + * @return 工具栏组件 + */ + JComponent[] toolbarPanes4Form(); JComponent[] toolBarButton4Form(); diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java index 063a685d80..7d1f65a789 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java @@ -1,18 +1,21 @@ package com.fr.design.parameter; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.Parameter; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.constants.LayoutConstants; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import javax.swing.JPanel; import java.awt.BorderLayout; -import java.awt.Component; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; public class ParameterPane extends BasicBeanPane { @@ -34,27 +37,24 @@ public class ParameterPane extends BasicBeanPane { } protected void initComponents() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setLayout(new BorderLayout()); + //名字 nameTextField = new UITextField(10); nameTextField.setEditable(false); - - JPanel textFieldPanel=FRGUIPaneFactory.createBorderLayout_S_Pane(); - textFieldPanel.add(nameTextField,BorderLayout.CENTER); - + //默认值 valueEditor = ValueEditorPaneFactory.createBasicValueEditorPane(); - // richer:要排列显示的控件 - Component[][] components = {{null}, - { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"),textFieldPanel }, - { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Default_Value") + ":"),valueEditor } - }; - double p =TableLayout.PREFERRED; - double f =TableLayout.FILL; - double[] rowSize = {p, p, p, p}; - double[] columnSize = {p, p, f, p, p}; - - JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane( - components, rowSize, columnSize, 20, 10); + JPanel centerPane = column(LayoutConstants.VERTICAL_GAP, + row(20, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"))).weight(0.1), + cell(nameTextField).weight(0.8), + flex(0.1)), + row(20, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Default_Value"))).weight(0.1), + cell(valueEditor).weight(0.8), + flex(0.1)) + ).getComponent(); + centerPane.setBorder(new ScaledEmptyBorder(0, 20, 0, 0)); this.add(centerPane, BorderLayout.CENTER); } diff --git a/designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java b/designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java index 3e70ff8d25..4c270851e3 100644 --- a/designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java +++ b/designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java @@ -18,7 +18,7 @@ public class FormulaPresentPane extends FurtherBasicBeanPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); tinyFormulaPane = new TinyFormulaPane(); - this.add(tinyFormulaPane, BorderLayout.CENTER); + this.add(tinyFormulaPane, BorderLayout.NORTH); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java index 7ffb4e61e0..5c157a7cd9 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java @@ -1,5 +1,6 @@ package com.fr.design.present.dict; +import com.fine.swing.ui.layout.Layouts; import com.fr.base.BaseFormula; import com.fr.base.TableData; import com.fr.data.core.DataCoreUtils; @@ -23,22 +24,23 @@ import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.stable.StringUtils; -import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; + public class DatabaseDictPane extends FurtherBasicBeanPane implements Previewable, UIObserver { /** * richer:数据字典和数据链面板 */ - private static final int GAP_HUGER = 32; protected com.fr.data.impl.Connection database; protected DoubleDeckValueEditorPane keyColumnPane; protected DoubleDeckValueEditorPane valueDictPane; @@ -60,31 +62,32 @@ public class DatabaseDictPane extends FurtherBasicBeanPane i private void initBasicComponet() { -// keyColumnPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); keyColumnPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Parameter_Formula")); formulaEditor.setEnabled(true); -// valueDictPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); valueDictPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); } private void initComponet() { chooseTable = new VerticalChoosePane(this); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p, p, p, p}; - int[][] rowCount = {{1, 1}, {1, 3}, {1, 3}}; - - Component[][] components = new Component[][]{ - new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyColumnPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value"), UILabel.LEFT), valueDictPane} - }; - JPanel dbDictPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, GAP_HUGER, LayoutConstants.VGAP_LARGE); - this.setLayout(new BorderLayout(0, 4)); - this.add(chooseTable, BorderLayout.NORTH); - this.add(dbDictPanel, BorderLayout.CENTER); + this.setLayout(new BorderLayout()); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + cell(chooseTable), + row( + column(LayoutConstants.VERTICAL_GAP, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT)).weight(1), + flex(1) + ).weight(1), + cell(keyColumnPane).weight(2) + ), + row( + column(LayoutConstants.VERTICAL_GAP, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value"), UILabel.LEFT)).weight(1), + flex(1) + ).weight(1), + cell(valueDictPane).weight(2) + ) + ).getComponent(), BorderLayout.CENTER); } diff --git a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java index 94e4b3f0ff..4de6c29491 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java @@ -1,5 +1,6 @@ package com.fr.design.present.dict; +import com.fine.swing.ui.layout.Layouts; import com.fr.data.Dictionary; import com.fr.data.impl.DynamicSQLDict; import com.fr.design.beans.FurtherBasicBeanPane; @@ -8,8 +9,6 @@ import com.fr.design.data.DataCreatorUI; import com.fr.design.data.tabledata.Prepare4DataSourceChange; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import javax.swing.*; @@ -17,6 +16,9 @@ import java.awt.*; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * @author zhou * @since 2012-5-31下午12:20:41 @@ -29,20 +31,14 @@ public class DictionaryPane extends UIComboBoxPane implements DataCr @Override protected void initLayout() { - this.setLayout(new BorderLayout(0, 4)); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p}; - int[][] rowCount = {{1, 1}, {1, 1}}; - - Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Set"), UILabel.LEFT), jcb}, - new Component[]{null, null} - }; - JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_HUGER, LayoutConstants.VGAP_MEDIUM); - this.add(northPane, BorderLayout.NORTH); - this.add(cardPane, BorderLayout.CENTER); + this.setLayout(new BorderLayout()); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Set"), UILabel.LEFT)).weight(1), + cell(jcb).weight(2) + ), + cell(cardPane).weight(1) + ).weight(1).getComponent()); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java index 2eca81466b..01d60c59fd 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java @@ -1,27 +1,27 @@ package com.fr.design.present.dict; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseFormula; -import com.fr.base.BaseUtils; import com.fr.data.impl.FormulaDictionary; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.constants.LayoutConstants; import com.fr.design.editor.editor.FormulaEditor; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; - -import com.fr.design.widget.FRWidgetFactory; import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.JPanel; +import javax.swing.JLabel; import javax.swing.event.DocumentListener; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Color; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; public class FormulaDictPane extends FurtherBasicBeanPane { - private static final int EDITOR_COLUMN = 15; - private static final int LEFT_BORDER = 5; - private static final int MAX_WIDTH = 30; private FormulaEditor keyFormulaEditor; private FormulaEditor valueFormulaEditor; @@ -31,48 +31,27 @@ public class FormulaDictPane extends FurtherBasicBeanPane { private void initComponents() { keyFormulaEditor = new FormulaEditor(); - keyFormulaEditor.setColumns(EDITOR_COLUMN); - JPanel keyFormulaContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, LEFT_BORDER, 0)); - keyFormulaContainer.setBorder(BorderFactory.createEmptyBorder(0, -LEFT_BORDER, 0, -LEFT_BORDER)); - keyFormulaEditor.setPreferredSize(new Dimension(144, 20)); - Icon icon = BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"); - keyFormulaContainer.add(new JLabel(icon)); - keyFormulaContainer.add(keyFormulaEditor); - valueFormulaEditor = new FormulaEditor(); - valueFormulaEditor.setColumns(EDITOR_COLUMN); - - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p, p}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; + // html多行提示待优化 UILabel tag = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Dictionary_Display_Examples_Html")); tag.setForeground(new Color(143, 143, 146)); - tag.setPreferredSize(new Dimension(225, 80)); - JPanel t = new JPanel(new BorderLayout()); - t.add(tag, BorderLayout.CENTER); BaseFormula vf = BaseFormula.createFormulaBuilder().build("$$$"); valueFormulaEditor = new FormulaEditor(StringUtils.EMPTY, vf); - - JPanel valueFormulaContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, LEFT_BORDER, 0)); - valueFormulaContainer.setBorder(BorderFactory.createEmptyBorder(0, -LEFT_BORDER, 0, -LEFT_BORDER)); - valueFormulaEditor.setPreferredSize(new Dimension(144, 20)); - valueFormulaContainer.add(new JLabel(icon)); - valueFormulaContainer.add(valueFormulaEditor); - - Component[][] components = new Component[][]{ - new Component[]{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), MAX_WIDTH, UILabel.LEFT), keyFormulaContainer}, - new Component[]{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value"), MAX_WIDTH, UILabel.LEFT), valueFormulaContainer}, - new Component[]{tag, null} - }; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_LARGE); - + JPanel panel = column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"))).weight(1), + row(cell(new JLabel(new LazyIcon("formula"))), fix(4), cell(keyFormulaEditor).weight(1)).weight(2) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value"))).weight(1), + row(cell(new JLabel(new LazyIcon("formula"))), fix(4), cell(valueFormulaEditor).weight(1)).weight(2) + ), + cell(tag) + ).getComponent(); this.setLayout(new BorderLayout()); this.add(panel, BorderLayout.CENTER); - } public void addChangeListener(DocumentListener l) { diff --git a/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java index 5ebd426593..a651bbdbc8 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java @@ -1,5 +1,6 @@ package com.fr.design.present.dict; +import com.fine.swing.ui.layout.Layouts; import com.fr.base.BaseFormula; import com.fr.base.TableData; import com.fr.data.TableDataSource; @@ -27,24 +28,20 @@ import com.fr.design.editor.editor.FormulaEditor; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; import javax.swing.JFrame; import javax.swing.JPanel; -import javax.swing.SwingWorker; import java.awt.BorderLayout; -import java.awt.Component; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ExecutionException; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; /** * 数据字典的数据查询面板 @@ -55,9 +52,7 @@ import java.util.concurrent.ExecutionException; public class TableDataDictPane extends FurtherBasicBeanPane implements Previewable, UIObserver, Prepare4DataSourceChange { private static final int BEGIN = 1; private static final int END = 10; - private static final int VGAP = 24; private static final long serialVersionUID = -5469742115988153206L; - private static final int SELECTED_NO_TABLEDATA = -2; public TableDataComboBox tableDataNameComboBox; private DoubleDeckValueEditorPane keyColumnPane; private DoubleDeckValueEditorPane valueDictPane; @@ -89,35 +84,32 @@ public class TableDataDictPane extends FurtherBasicBeanPane tdChange(e); } }); -// keyColumnPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); keyColumnPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); formulaEditor.setEnabled(true); -// valueDictPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); valueDictPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); } private void initComponents() { - - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p, p, p, p}; - int[][] rowCount = {{1, 1}, {1, 3}, {1, 3}}; - JPanel firstLine = new JPanel(new BorderLayout(4, 0)); firstLine.add(tableDataNameComboBox, BorderLayout.CENTER); firstLine.add(new PreviewLabel(this), BorderLayout.EAST); - Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Table_Data") + " ", UILabel.LEFT), firstLine}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + " ", UILabel.LEFT), keyColumnPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + " ", UILabel.LEFT), valueDictPane}, - }; - - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, VGAP, LayoutConstants.VGAP_MEDIUM); this.setLayout(new BorderLayout()); - this.add(panel, BorderLayout.CENTER); + this.add(Layouts.column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Table_Data"), UILabel.LEFT)).weight(1), + cell(firstLine).weight(2) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT)).weight(1), + cell(keyColumnPane).weight(2) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value"), UILabel.LEFT)).weight(1), + cell(valueDictPane).weight(2) + ) + ).getComponent(), BorderLayout.CENTER); } @@ -195,9 +187,6 @@ public class TableDataDictPane extends FurtherBasicBeanPane } @Override - /** - * - */ public void populateBean(TableDataDictionary tableDataDict) { populate(tableDataDict, ""); } diff --git a/designer-base/src/main/java/com/fr/design/preview/FormPreview.java b/designer-base/src/main/java/com/fr/design/preview/FormPreview.java index 83b8a353f2..324a7a1ca6 100644 --- a/designer-base/src/main/java/com/fr/design/preview/FormPreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/FormPreview.java @@ -26,6 +26,11 @@ public class FormPreview extends AbstractPreviewProvider { return "/com/fr/design/standard/preview/run24.svg"; } + @Override + public String iconIdForPopupItem() { + return "default"; + } + @Override public int previewTypeCode() { return PREVIEW_TYPE; diff --git a/designer-base/src/main/java/com/fr/design/preview/MobilePreview.java b/designer-base/src/main/java/com/fr/design/preview/MobilePreview.java index a55eb25733..c1548029e8 100644 --- a/designer-base/src/main/java/com/fr/design/preview/MobilePreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/MobilePreview.java @@ -27,6 +27,11 @@ public class MobilePreview extends AbstractPreviewProvider { return "/com/fr/design/standard/preview/mobileb24.svg"; } + @Override + public String iconIdForPopupItem() { + return "preview_mobile"; + } + @Override public int previewTypeCode() { return PREVIEW_TYPE; diff --git a/designer-base/src/main/java/com/fr/design/preview/PagePlusPreview.java b/designer-base/src/main/java/com/fr/design/preview/PagePlusPreview.java index 04fd6623c8..d2ec7bf41d 100644 --- a/designer-base/src/main/java/com/fr/design/preview/PagePlusPreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/PagePlusPreview.java @@ -27,6 +27,11 @@ public class PagePlusPreview extends AbstractPreviewProvider { return "com/fr/design/images/buttonicon/pageb24.png"; } + @Override + public String iconIdForPopupItem() { + return "default"; + } + @Override public int previewTypeCode() { return CODE; diff --git a/designer-base/src/main/java/com/fr/design/preview/PagePreview.java b/designer-base/src/main/java/com/fr/design/preview/PagePreview.java index c2f15c915a..2473f56086 100644 --- a/designer-base/src/main/java/com/fr/design/preview/PagePreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/PagePreview.java @@ -25,6 +25,11 @@ public class PagePreview extends AbstractPreviewProvider { return "/com/fr/design/standard/preview/pageb24.svg"; } + @Override + public String iconIdForPopupItem() { + return "preview_paging"; + } + @Override public int previewTypeCode() { return IOFile.DEFAULT_PREVIEW_TYPE; diff --git a/designer-base/src/main/java/com/fr/design/preview/ViewPreview.java b/designer-base/src/main/java/com/fr/design/preview/ViewPreview.java index 5df602649c..fee54a06e0 100644 --- a/designer-base/src/main/java/com/fr/design/preview/ViewPreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/ViewPreview.java @@ -28,6 +28,11 @@ public class ViewPreview extends AbstractPreviewProvider { return "/com/fr/design/standard/preview/anab24.svg"; } + @Override + public String iconIdForPopupItem() { + return "data_analysis"; + } + @Override public int previewTypeCode() { return IOFile.ANA_PREVIEW_TYPE; diff --git a/designer-base/src/main/java/com/fr/design/preview/WritePreview.java b/designer-base/src/main/java/com/fr/design/preview/WritePreview.java index 8cac86f392..4778e072d3 100644 --- a/designer-base/src/main/java/com/fr/design/preview/WritePreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/WritePreview.java @@ -28,6 +28,11 @@ public class WritePreview extends AbstractPreviewProvider { return "/com/fr/design/standard/preview/writeb24.svg"; } + @Override + public String iconIdForPopupItem() { + return "preview_write"; + } + @Override public int previewTypeCode() { return IOFile.WRITE_PREVIEW_TYPE; diff --git a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java index 30112dc7a3..5b00029226 100644 --- a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java @@ -1,6 +1,6 @@ package com.fr.design.remote.action; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -27,7 +27,7 @@ public class RemoteDesignAuthManagerAction extends UpdateAction { public RemoteDesignAuthManagerAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager")); // 远程设计权限管理 - this.setSmallIcon("com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x"); + this.setSmallIcon(new LazyIcon("remoteDesignAuthManager")); } diff --git a/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java b/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java index 7781233aac..5450e30fd5 100644 --- a/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java +++ b/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java @@ -1,10 +1,14 @@ package com.fr.design.report; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.base.Style; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.ImgChooseWrapper; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIRadioButton; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.background.image.ImageFileChooser; import com.fr.design.style.background.image.ImagePreviewPane; @@ -13,7 +17,8 @@ import com.fr.report.cell.Elem; import com.fr.report.cell.cellattr.CellImage; import com.fr.report.cell.painter.CellImagePainter; import com.fr.stable.Constants; -import java.awt.BorderLayout; + +import java.awt.Color; import java.awt.GridLayout; import java.awt.Image; import java.awt.event.ActionEvent; @@ -25,6 +30,10 @@ import javax.swing.JFileChooser; import javax.swing.JPanel; import javax.swing.JScrollPane; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; + /** *

这个类主要用于插入图片时的设置

*

这个类原本在designer-realize包下面，现在表单也可选择图片，所以应该抽为公用的base包。包名不变，应该不影响插件使用

@@ -69,33 +78,33 @@ public class SelectImagePane extends BasicPane { public SelectImagePane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - // preview pane - JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(previewContainerPane, BorderLayout.CENTER); - - JPanel previewOwnerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); - - previewOwnerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null)); - previewPane = new ImagePreviewPane(); - previewOwnerPane.add(new JScrollPane(previewPane)); - - JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - previewContainerPane.add(selectFilePane, BorderLayout.EAST); - selectFilePane.setBorder(BorderFactory - .createEmptyBorder(8, 2, 4, 0)); + previewPane.setOpaque(false); + this.add(column( + 5, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))).with(it -> FineUIStyle.setStyle(it, FineUIStyle.LABEL_TIP)), + row( + 10, + cell(new JScrollPane(previewPane)).with(it -> { + it.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + it.getViewport().setOpaque(false); + it.setBorder(new FineRoundBorder()); + }).weight(1), + cell(initSelectFilePane()) + ).weight(1) + ).getComponent()); + } + /** + * 选择图片 + * @return + */ + public JPanel initSelectFilePane() { UIButton selectPictureButton = new UIButton( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture")); - selectFilePane.add(selectPictureButton, BorderLayout.NORTH); selectPictureButton.setMnemonic('S'); selectPictureButton.addActionListener(selectPictureActionListener); - - JPanel layoutPane = FRGUIPaneFactory.createMediumHGapHighTopFlowInnerContainer_M_Pane(); - selectFilePane.add(layoutPane, BorderLayout.CENTER); - //布局 defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled")); @@ -107,12 +116,11 @@ public class SelectImagePane extends BasicPane { extendRadioButton.addActionListener(layoutActionListener); adjustRadioButton.addActionListener(layoutActionListener); - JPanel jp = new JPanel(new GridLayout(4, 1, 15, 15)); + JPanel jp = new JPanel(new GridLayout(4, 1, 10, 10)); jp.add(defaultRadioButton); jp.add(tiledRadioButton); jp.add(extendRadioButton); jp.add(adjustRadioButton); - layoutPane.add(jp); ButtonGroup layoutBG = new ButtonGroup(); layoutBG.add(defaultRadioButton); @@ -125,6 +133,7 @@ public class SelectImagePane extends BasicPane { // init image file chooser. imageFileChooser = new ImageFileChooser(); imageFileChooser.setMultiSelectionEnabled(false); + return column(10, cell(selectPictureButton), cell(jp)).getComponent(); } // 调整图片样式，只有水平和垂直对齐以及拉伸。相对于背景，平铺不予考虑。 diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java index e06046e079..9e77340884 100644 --- a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java +++ b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java @@ -1,53 +1,55 @@ package com.fr.design.report; +import com.fine.theme.light.ui.FineRoundBorder; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseFormula; import com.fr.base.iofile.attr.WatermarkAttr; +import com.fr.design.border.FineBorderFactory; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.editor.editor.FormulaEditor; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UnsignedIntUISpinner; import com.fr.design.gui.style.FRFontPane; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.color.NewColorSelectPane; -import com.fr.design.utils.gui.GUICoreUtils; -import javax.swing.BorderFactory; -import javax.swing.SwingConstants; -import javax.swing.JComponent; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import javax.swing.JDialog; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import java.awt.Dimension; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Dimension; +import java.awt.Dialog; +import java.awt.FlowLayout; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import java.awt.event.FocusAdapter; -import java.awt.Dialog; -import java.awt.FlowLayout; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineUIUtils.wrapComponentWithTitle; /** * Created by plough on 2018/5/15. */ public class WatermarkPane extends BasicPane { - private static final int MAX_WIDTH = 216; // 水印预览面板 private WatermarkPreviewPane watermarkPreviewPane; @@ -57,7 +59,7 @@ public class WatermarkPane extends BasicPane { private UIComboBox fontSizeComboBox; //横向间距 private UISpinner horizontalGapSpinner; - //横向间距 + //纵向间距 private UISpinner verticalGapSpinner; // 文字颜色 private NewColorSelectPane colorPane; @@ -69,7 +71,7 @@ public class WatermarkPane extends BasicPane { //纵向间距最小值 public static final int VERTICAL_GAP_MIX = 50; - private static final Dimension SPINNER_DIMENSION = new Dimension(75, 20); + private JPanel leftPane; public WatermarkPane() { initComponents(); @@ -77,26 +79,30 @@ public class WatermarkPane extends BasicPane { private void initComponents() { message = new UILabel(); - this.setBorder(BorderFactory.createEmptyBorder(4, 4, -5, 4)); - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - - JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(contentPane, BorderLayout.CENTER); - - // 预览 - JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - contentPane.add(leftPane, BorderLayout.CENTER); - leftPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Style_Preview"), null)); - JPanel previewPaneWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane(); - leftPane.add(previewPaneWrapper, BorderLayout.CENTER); - previewPaneWrapper.setBorder(BorderFactory.createEmptyBorder(2, 8, 4, 8)); + this.setLayout(new BorderLayout()); + //左侧预览面板 + JPanel previewPaneWrapper = new JPanel(new BorderLayout()); + //预览外边框，宽度跟随全局权重 + previewPaneWrapper.setBorder(new FineRoundBorder()); + previewPaneWrapper.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); watermarkPreviewPane = new WatermarkPreviewPane(); - previewPaneWrapper.add(watermarkPreviewPane, BorderLayout.CENTER); - - // 设置 - JPanel rightPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - contentPane.add(rightPane, BorderLayout.EAST); - rightPane.add(initRightPane(), BorderLayout.NORTH); + watermarkPreviewPane.setOpaque(false); + previewPaneWrapper.add(watermarkPreviewPane); + leftPane = column( + LayoutConstants.VGAP_SMALL, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Style_Preview"))), + cell(previewPaneWrapper).weight(1) + ).getComponent(); + + // 分割线下方,左侧预览,右侧配置 + JPanel centerPanel = column(LayoutConstants.VERTICAL_GAP, + cell(new JPanel()).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder())), + row(LayoutConstants.HORIZONTAL_GAP, + cell(leftPane).weight(0.55), + cell(wrapComponentWithTitle(getRightPane(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Config"))).weight(0.45) + ).weight(1) + ).getComponent(); + this.add(centerPanel); } public void populate(WatermarkAttr watermark) { @@ -129,60 +135,59 @@ public class WatermarkPane extends BasicPane { this.formulaPane = formulaPane; } - protected UIScrollPane initRightPane() { + /** + * 配置Pane + * @return + */ + protected JPanel getRightPane() { + // 文字 formulaPane = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); + // 字号 fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES); fontSizeComboBox.setEditable(true); + + //水印间距 horizontalGapSpinner = new UnsignedIntUISpinner(100, Integer.MAX_VALUE, 1, 200); verticalGapSpinner = new UnsignedIntUISpinner(50, Integer.MAX_VALUE, 1, 100); - horizontalGapSpinner.setPreferredSize(SPINNER_DIMENSION); - verticalGapSpinner.setPreferredSize(SPINNER_DIMENSION); - message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); //失去焦点时要判断是否要弹出提示 horizontalGapSpinner.getTextField().addFocusListener( createFocusListener4GapNumberField(horizontalGapSpinner, HORIZONTAL_GAP_MIX, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Horizontal_Gap_Over_Warning"))); verticalGapSpinner.getTextField().addFocusListener(createFocusListener4GapNumberField(verticalGapSpinner, VERTICAL_GAP_MIX, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vertical_Gap_Over_Warning"))); - //next 按钮 释放时也要判断是否要弹出提示 horizontalGapSpinner.getNextButton().addMouseListener(createMouseListener4GapNextButton(horizontalGapSpinner, HORIZONTAL_GAP_MIX, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Horizontal_Gap_Over_Warning"))); verticalGapSpinner.getNextButton().addMouseListener(createMouseListener4GapNextButton(verticalGapSpinner, VERTICAL_GAP_MIX, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vertical_Gap_Over_Warning"))); - - JPanel fontSizeTypePane = new JPanel(new BorderLayout(10, 0)); - fontSizeTypePane.add(fontSizeComboBox, BorderLayout.CENTER); - - //水印间距面板 - JPanel watermarkGapPane = new JPanel(new BorderLayout(10, 0)); - JPanel jp = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 0); - jp.add(horizontalGapSpinner); - jp.add(verticalGapSpinner); - watermarkGapPane.add(jp, BorderLayout.CENTER); - - JPanel watermarkGapTipsPane = new JPanel(new BorderLayout()); - JPanel tipsJp = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 0); - tipsJp.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"), SwingConstants.CENTER)); - tipsJp.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"), SwingConstants.CENTER)); - watermarkGapTipsPane.add(tipsJp, BorderLayout.CENTER); - + //水印间距提示居中布局 + JPanel watermarkGapTipsPane = row(LayoutConstants.HGAP_LARGE, + flex(0.15), + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"))).weight(0.2), + flex(0.3), + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"))).weight(0.2), + flex(0.15) + ).getComponent(); + //水印间距排列 + JPanel watermarkGapPane = column( + row(LayoutConstants.HGAP_LARGE, + cell(horizontalGapSpinner).weight(0.5), + cell(verticalGapSpinner).weight(0.5) + ), + cell(watermarkGapTipsPane) + ).getComponent(); + // 颜色选择器 colorPane = new NewColorSelectPane(false); - JPanel colorLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - colorLabelPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text_Color")), BorderLayout.NORTH); - - double p = TableLayout.PREFERRED; - double[] rowSize = {p, p, p, p, p}; - double[] columnSize = {p, MAX_WIDTH}; - - JPanel rightContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Watermark_Text")), formulaPane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Size")), fontSizeTypePane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Watermark_Gap")), watermarkGapPane}, - {null, watermarkGapTipsPane}, - {colorLabelPane, colorPane}, - }, rowSize, columnSize, 10); - rightContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); - - UIScrollPane configPane = new UIScrollPane(rightContentPane); - configPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Config"), null)); - return configPane; + // 配置面板排列布局 + JPanel rightContentPane = column(LayoutConstants.VERTICAL_GAP, + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Watermark_Text"))).weight(0.3), cell(formulaPane).weight(0.7)), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Size"))).weight(0.3), cell(fontSizeComboBox).weight(0.7)), + row(cell(getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Watermark_Gap"))).weight(0.3), cell(watermarkGapPane).weight(0.7)), + row(cell(getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text_Color"))).weight(0.3), cell(colorPane).weight(0.7)) + ).getComponent(); + rightContentPane.setOpaque(false); + return rightContentPane; + } + + private JPanel getTopAlignLabelPane(String labelText) { + return column(LayoutConstants.VERTICAL_GAP, cell(new UILabel(labelText))). + with(it -> it.setBorder(new ScaledEmptyBorder(2,0,0,0))).getComponent(); } protected void populateFontSize(int fontSize) { diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java index f3de6eef96..da5ee01db7 100644 --- a/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java @@ -20,7 +20,7 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane { } private void initComponents() { - buttonPane.setBorder(BorderFactory.createEmptyBorder(10, 8, 0, 0)); + //buttonPane.setBorder(BorderFactory.createEmptyBorder(10, 8, 0, 0)); } @Override diff --git a/designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java index 83274e7bb9..128972b755 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java @@ -1,12 +1,12 @@ package com.fr.design.report.fit; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.ExtraDesignClassManager; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.report.fit.provider.FitAttrModelProvider; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.report.fit.ReportFitAttr; import javax.swing.*; @@ -17,6 +17,10 @@ import java.util.Comparator; import java.util.Set; import java.util.stream.Collectors; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; +import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; import static com.fr.design.i18n.Toolkit.i18nText; public abstract class BaseFitAttrPane extends BasicBeanPane { @@ -26,23 +30,23 @@ public abstract class BaseFitAttrPane extends BasicBeanPane { protected UIComboBox itemChoose; protected java.util.List fitAttrModelList = new ArrayList<>(); private ReportFitConfigPane fitConfigPane; - public FitAttrModel fitAttrModel; - private static final int BELOW_SET_COMPONENT_HSPACE = 8; - protected BaseFitAttrPane() { initFitAttrModel(); } private void initFitAttrModel() { + //旧决策报表 + fitAttrModelList.add(new FrmFitAttrModel()); + //普通报表 fitAttrModelList.add(new CptFitAttrModel()); + //决策报表 + fitAttrModelList.add(new AdaptiveFrmFitAttrModel()); Set fitAttrModelProviders = ExtraDesignClassManager.getInstance().getArray(FitAttrModelProvider.XML_TAG); - for (FitAttrModelProvider fitAttrModelProvider : fitAttrModelProviders) { fitAttrModelList.add(fitAttrModelProvider); } - fitAttrModelList = fitAttrModelList.stream().sorted(Comparator.comparing(FitAttrModel::getPriority).reversed()).collect(Collectors.toList()); } @@ -52,6 +56,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane { contentJPanel.remove(fitConfigPane); } this.fitConfigPane = fitAttrModel instanceof CptFitAttrModel ? new ReportFitConfigPane(fitAttrModel, true) : new FormFitConfigPane(fitAttrModel, true); + //添加自适应面板 contentJPanel.add(fitConfigPane); } @@ -79,34 +84,34 @@ public abstract class BaseFitAttrPane extends BasicBeanPane { protected abstract String[] getItemNames(); protected void initComponents() { - this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); - this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - contentJPanel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(false, FlowLayout.LEFT, 0, 0); - this.add(contentJPanel); + //添加以下设置 initItemChoose(); + //服务器配置-PC端自适应属性面板中需要添加提示 initPrompt(); + this.setLayout(new BorderLayout()); + this.add(contentJPanel); } - + /** + * 以下设置Pane + */ private void initItemChoose() { - JPanel chooseJPanel = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); - ItemListener itemListener = getItemListener(); + belowSetLabel = new UILabel(i18nText("Fine-Design_Report_Blow_Set")); itemChoose = new UIComboBox(getItemNames()); + itemChoose.putClientProperty(COMBO_BOX_TYPE, ADAPTIVE_COMBO_BOX); + ItemListener itemListener = getItemListener(); itemChoose.addItemListener(itemListener); - belowSetLabel = new UILabel(i18nText("Fine-Design_Report_Blow_Set")); - JPanel hSpaceLabel = new JPanel(); - hSpaceLabel.setSize(BELOW_SET_COMPONENT_HSPACE, 0); - JPanel buttonPane = GUICoreUtils.createFlowPane(new Component[]{ - belowSetLabel, hSpaceLabel, itemChoose}, FlowLayout.LEFT); - chooseJPanel.add(buttonPane); - chooseJPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0)); - contentJPanel.add(chooseJPanel); + //以下设置横向布局 + JPanel buttonPane = row(20, cell(belowSetLabel), cell(itemChoose)).getComponent(); + buttonPane.setBorder(new ScaledEmptyBorder(0,5,5,0)); + //整体面板添加‘以下设置Pane’ + contentJPanel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(false, FlowLayout.LEFT, 0, 0); + contentJPanel.setBorder(new ScaledEmptyBorder(5,10,5,10)); + contentJPanel.add(buttonPane); } - protected abstract ItemListener getItemListener(); - public void populate(ReportFitAttr reportFitAttr) { } diff --git a/designer-base/src/main/java/com/fr/design/report/fit/FormFitConfigPane.java b/designer-base/src/main/java/com/fr/design/report/fit/FormFitConfigPane.java index d88a3a16eb..8bf088b6fd 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/FormFitConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/FormFitConfigPane.java @@ -1,11 +1,12 @@ package com.fr.design.report.fit; -import com.fr.base.svg.SVGLoader; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.imenu.UIPopupMenu; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.report.fit.menupane.FitRadioGroup; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; @@ -13,23 +14,22 @@ import com.fr.report.fit.ReportFitAttr; import javax.swing.JPanel; import javax.swing.JPopupMenu; import java.awt.BorderLayout; -import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics; -import java.awt.Image; import java.awt.Rectangle; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + public class FormFitConfigPane extends ReportFitConfigPane { private static final int ICON_OFFSET_X = 25; - private static final int ICON_OFFSET_Y = 3; + private static final int ICON_OFFSET_Y = 2; private static final int ICON_SIZE = 16; - private static final Image HOVER_IMAGE = SVGLoader.load("/com/fr/design/icon/icon_ec_default_fit.svg"); private static final int DEFAULT_ITEM = 0; - private static final int CUSTOM_ITEM = 1; public FormFitConfigPane(FitAttrModel fitAttrModel) { @@ -41,12 +41,11 @@ public class FormFitConfigPane extends ReportFitConfigPane { } protected JPanel initECConfigPane() { - JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + JPanel jPanel = new JPanel(new BorderLayout()); if (fitAttrModel.getFitTypeNames().length != 0) { Component[] ecComponents = new Component[fitAttrModel.getFitTypeNames().length + 1]; initRadioGroup(ecConfigRadioGroup, fitAttrModel.getFitName(), fitAttrModel.getFitTypeNames(), ecComponents); - jPanel.add(createSubAttrPane(ecComponents), BorderLayout.CENTER); - jPanel.add(createTipPane(), BorderLayout.SOUTH); + jPanel.add(column(LayoutConstants.VERTICAL_GAP, cell(createSubAttrPane(ecComponents)), cell(createTipPane())).getComponent()); } return jPanel; } @@ -79,7 +78,6 @@ public class FormFitConfigPane extends ReportFitConfigPane { UIPopupMenu uiPopupMenu = new UIPopupMenu() { @Override protected void paintBorder(Graphics g) { - } }; uiPopupMenu.setLayout(new BorderLayout(0, 0)); @@ -107,7 +105,6 @@ public class FormFitConfigPane extends ReportFitConfigPane { } else { hidePreviewPane(); } - } }); } @@ -128,24 +125,23 @@ public class FormFitConfigPane extends ReportFitConfigPane { @Override public void paint(Graphics g) { super.paint(g); - g.drawImage(HOVER_IMAGE, calculateStartX() + ICON_OFFSET_X, ICON_OFFSET_Y, null); + new LazyIcon("detail").paintIcon(this, g, calculateStartX() + ICON_OFFSET_X, ICON_OFFSET_Y); } - private int calculateStartX() { + /** + * 默认文本宽度 + * @return + */ + private int calculateStartX() { FontMetrics metrics = this.getFontMetrics(this.getFont()); return metrics.stringWidth(this.getText()); } } private JPanel createTipPane() { - JPanel jPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true); - UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Form_PC_FIT_Config_Tip1")); - jPanel.add(label1); - label1.setForeground(Color.lightGray); - UILabel label2 = new UILabel(Toolkit.i18nText("Fine-Design_Form_PC_FIT_Config_Tip2")); - jPanel.add(label2); - label2.setForeground(Color.lightGray); - return jPanel; + return column(cell(new UILabel(Toolkit.i18nText("Fine-Design_Form_PC_FIT_Config_Tip1"), FineUIStyle.LABEL_TIP)), + cell(new UILabel(Toolkit.i18nText("Fine-Design_Form_PC_FIT_Config_Tip2"), FineUIStyle.LABEL_TIP)) + ).getComponent(); } protected void refreshPreviewJPanel() { @@ -159,5 +155,4 @@ public class FormFitConfigPane extends ReportFitConfigPane { protected void updateECConfigRadioGroup(ReportFitAttr reportFitAttr) { reportFitAttr.setFitStateInPC(ecConfigRadioGroup.getSelectRadioIndex()); } - } diff --git a/designer-base/src/main/java/com/fr/design/report/fit/NewFitPreviewPane.java b/designer-base/src/main/java/com/fr/design/report/fit/NewFitPreviewPane.java index 2bc69cedc7..36209972fc 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/NewFitPreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/NewFitPreviewPane.java @@ -1,5 +1,6 @@ package com.fr.design.report.fit; +import com.fine.theme.utils.FineUIScale; import com.fr.base.GraphHelper; import com.fr.general.FRFont; @@ -17,7 +18,7 @@ public class NewFitPreviewPane extends JPanel { private static final Color DEFAULT_PAINT_COLOR = Color.decode("#419BF9"); private static final int FIT_FONT_SIZE = 15; private static final int NO_FIT_FONT_SIZE = 10; - private static final Dimension NO_FIT_CONTAINER_DIMENSION = new Dimension(230, 80); + private static final Dimension NO_FIT_CONTAINER_DIMENSION = FineUIScale.scale(new Dimension(230, 80)); public NewFitPreviewPane(){ diff --git a/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java b/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java index 158089602f..20c2688392 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java @@ -1,5 +1,6 @@ package com.fr.design.report.fit; +import com.fine.theme.utils.FineUIScale; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.DesignSizeI18nManager; @@ -10,15 +11,16 @@ import com.fr.design.report.fit.menupane.FontRadioGroup; import com.fr.general.ComparatorUtils; import com.fr.report.fit.ReportFitAttr; -import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; import static com.fr.design.i18n.Toolkit.i18nText; public class ReportFitConfigPane extends JPanel { @@ -36,21 +38,24 @@ public class ReportFitConfigPane extends JPanel { } private void initComponent() { - JPanel contentJPanel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(false, FlowLayout.LEFT, 0, 0); - this.add(contentJPanel); fontRadioGroup = new FontRadioGroup(); ecConfigRadioGroup = new FitRadioGroup(); - contentJPanel.add(initAttrJPanel()); - contentJPanel.add(initPreviewJPanel()); + this.add(initContentPanel()); } - private JPanel initAttrJPanel() { - JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); + private JPanel initContentPanel() { + //字体 Component[] fontComponents = new Component[3]; initRadioGroup(fontRadioGroup, i18nText("Fine-Designer_Fit-Font"), new String[]{i18nText("Fine-Designer_Fit"), i18nText("Fine-Designer_Fit-No")}, fontComponents); - jPanel.add(createSubAttrPane(fontComponents), BorderLayout.NORTH); - jPanel.add(initECConfigPane(), BorderLayout.CENTER); - return jPanel; + //预览区域 + previewJPanel = new NewFitPreviewPane(); + previewJPanel.setPreferredSize(FineUIScale.scale(new Dimension(300, 204))); + //面板布局 字体-（null/报表块/表格）-预览区域 + return column(10, + cell(createSubAttrPane(fontComponents)), + cell(initECConfigPane()), + cell(previewJPanel) + ).getComponent(); } protected JPanel initECConfigPane() { @@ -61,21 +66,14 @@ public class ReportFitConfigPane extends JPanel { return jPanel; } - protected JPanel createSubAttrPane(Component[] components) { double[] rowSize = new double[]{20}; double[] columnSize = new double[components.length]; - for (int i = 0; i < columnSize.length; i++) { - if (i == 0) { - columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth(); - } else { - columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.column").getWidth(); - } + for (int i = 1; i < columnSize.length; i++) { + columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.column").getWidth(); } - JPanel attrJPanel = TableLayoutHelper.createTableLayoutPane(new Component[][]{components}, rowSize, columnSize); - attrJPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0)); - return attrJPanel; + return row(cell(components[0]).weight(0.16),cell(attrJPanel).weight(0.84)).getComponent(); } protected void initRadioGroup(FitRadioGroup fitRadioGroup, String name, String[] options, Component[] components) { @@ -110,17 +108,6 @@ public class ReportFitConfigPane extends JPanel { previewJPanel.refreshPreview(fontRadioGroup.isFontFit(), FitType.parse(updateBean())); } - private JPanel initPreviewJPanel() { - JPanel wrapperPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - previewJPanel = new NewFitPreviewPane(); - wrapperPane.add(previewJPanel, BorderLayout.CENTER); - int leftIndent = globalConfig ? (int) DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth() : 0; - wrapperPane.setBorder(BorderFactory.createEmptyBorder(0, leftIndent, 0, 0)); - wrapperPane.setPreferredSize(new Dimension(300 + leftIndent, 204)); - return wrapperPane; - } - - public void populateBean(ReportFitAttr ob) { fontRadioGroup.selectIndexButton(ob.isFitFont() ? 0 : 1); populateECConfigRadioGroup(ob.fitStateInPC()); diff --git a/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java index ba37ea18b7..374da1c83d 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java @@ -1,5 +1,6 @@ package com.fr.design.report.fit.menupane; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.JTemplateAction; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.DialogActionAdapter; @@ -45,7 +46,7 @@ public class ReportFitAttrAction extends JTemplateAction { this.setMenuKeySet(REPORT_FIT_ATTR); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/reportfit/fit"); + this.setSmallIcon(new LazyIcon("reportFit")); } /** diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java index f393b1a09c..7a57667532 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java @@ -1,5 +1,9 @@ package com.fr.design.roleAuthority; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineToggleButtonUI; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.base.vcs.DesignerMode; import com.fr.design.actions.UpdateAction; @@ -7,8 +11,10 @@ import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.tabledata.Prepare4DataSourceChange; import com.fr.design.dialog.FineJOptionPane; +import com.fr.design.gui.ibutton.UIHead; import com.fr.design.gui.ibutton.UIHeadGroup; import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.layout.FRGUIPaneFactory; @@ -21,10 +27,11 @@ import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; -import javax.swing.BorderFactory; import javax.swing.Icon; +import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JToggleButton; import javax.swing.JTree; import javax.swing.ScrollPaneConstants; import javax.swing.event.ChangeEvent; @@ -34,11 +41,20 @@ import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import java.awt.BorderLayout; -import java.awt.GridLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.ArrayList; import java.util.Enumeration; +import java.util.List; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; /** * 设计器左下角面板，用于在权限编辑时存放角色 @@ -80,17 +96,20 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo this.add(iniToolBarPane(), BorderLayout.NORTH); refreshAction.setEnabled(true); UIScrollPane scrollPane = new UIScrollPane(roleTree); - scrollPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 0)); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); initbuttonGroup(); JPanel jPanel = new JPanel(new BorderLayout(4, 4)); - JPanel buttonPane = new JPanel(new GridLayout()); - buttonPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR)); - buttonPane.add(buttonGroup, BorderLayout.CENTER); - jPanel.add(buttonPane, BorderLayout.NORTH); - jPanel.add(scrollPane, BorderLayout.CENTER); + buttonGroup.setBorder(null); + buttonGroup.setOpaque(false); + jPanel.setOpaque(true); + jPanel.add(column( + 4, + row(cell(buttonGroup), flex()), + cell(scrollPane) + ).getComponent()); this.add(jPanel, BorderLayout.CENTER); + jPanel.setBorder(new ScaledEmptyBorder(0, 4, 4, 4)); registerDSChangeListener(); } @@ -181,10 +200,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo } private void initbuttonGroup() { - - Icon[] iconArray = new Icon[]{BaseUtils.readIcon("/com/fr/web/images/platform/demo.png")}; - String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Name")}; - buttonGroup = new UIHeadGroup(iconArray, textArray) { + buttonGroup = new UIHeadGroup(iconList()) { public void tabChanged(int index) { roleTree.setEditable(false); if (op != null) { @@ -197,8 +213,27 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo } } }; - buttonGroup.setBorder(BorderFactory.createMatteBorder(1, LEFT_GAP, 0, 0, UIConstants.LINE_COLOR)); - buttonGroup.setNeedLeftRightOutLine(false); + + for (int i = 0; i < buttonGroup.getComponents().length; i++) { + Component component = buttonGroup.getComponent(i); + if (!(component instanceof JToggleButton)) { + continue; + } + ((JToggleButton) component).setUI(new FineToggleButtonUI(false) { + @Override + protected void paintBackground(Graphics g, JComponent c) { + super.paintBackground(g, c); + g.setColor(FlatUIUtils.getUIColor("default.background", new Color(246, 248, 250))); + g.fillRect(0, 0, getWidth(), getHeight()); + } + }); + } + } + + private static List iconList() { + List uiHeads = new ArrayList<>(); + uiHeads.add(new UIHead(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Name"), new LazyIcon("digitalPlatform"))); + return uiHeads; } /** @@ -254,7 +289,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo public RefreshAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh")); - this.setSmallIcon("/com/fr/design/images/buttonicon/refresh"); + this.setSmallIcon(new LazyIcon("refresh")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/scrollruler/BaseRuler.java b/designer-base/src/main/java/com/fr/design/scrollruler/BaseRuler.java index 770c7b2372..cfdfdd488d 100644 --- a/designer-base/src/main/java/com/fr/design/scrollruler/BaseRuler.java +++ b/designer-base/src/main/java/com/fr/design/scrollruler/BaseRuler.java @@ -1,5 +1,6 @@ package com.fr.design.scrollruler; +import com.fine.theme.utils.FineUIScale; import java.awt.Color; import java.awt.Dimension; import java.awt.Font; @@ -100,7 +101,7 @@ public abstract class BaseRuler extends JComponent { protected abstract RulerUI getRulerUI(); public Dimension getPreferredSize() { - return new Dimension(_WIDTH, _HEIGHT); + return FineUIScale.scale(new Dimension(_WIDTH, _HEIGHT)); } // class RulerUnitItem extends UICheckBoxMenuItem { diff --git a/designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java b/designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java index 0d2fd752c6..12e651dfed 100644 --- a/designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java +++ b/designer-base/src/main/java/com/fr/design/search/view/TreeSearchRendererHelper.java @@ -1,10 +1,13 @@ package com.fr.design.search.view; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.gui.itree.refreshabletree.RefreshableJTree; +import com.fr.stable.StableUtils; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.TreeCellRenderer; +import java.awt.Color; import java.awt.Component; import java.util.regex.Pattern; @@ -67,7 +70,9 @@ public class TreeSearchRendererHelper { } private String getHighlightText(String text, String textToHighlight) { - String highLightTemplate = "$1"; + Color color = FlatUIUtils.getUIColor("text.highlight", Color.YELLOW); + String cssColor = StableUtils.javaColorToCSSColor(color); + String highLightTemplate = "$1"; if (textToHighlight.length() == 0) { return text; } diff --git a/designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java b/designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java index e59ddfa579..792360f4d4 100644 --- a/designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java +++ b/designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java @@ -1,29 +1,25 @@ package com.fr.design.style; -import com.fr.design.constants.UIConstants; -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.ibutton.UIButtonUI; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatArrowButton; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.fr.design.event.HoverAware; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.background.BackgroundJComponent; -import com.fr.design.utils.gui.GUIPaintUtils; -import com.fr.stable.Constants; -import javax.swing.AbstractButton; import javax.swing.JPanel; -import javax.swing.JWindow; -import javax.swing.border.AbstractBorder; +import javax.swing.JButton; +import javax.swing.UIManager; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; -import javax.swing.plaf.ButtonUI; +import javax.swing.SwingConstants; import java.awt.BorderLayout; -import java.awt.Component; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Insets; import java.awt.Point; import java.awt.Rectangle; -import java.awt.RenderingHints; +import java.awt.Color; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -33,175 +29,172 @@ import java.awt.event.MouseListener; * @version 创建时间：2011-10-31 下午03:28:31 类说明: 抽象出来的弹出box. 可以弹出颜色选择, 图案选择, 纹理选择. * 主要是 弹出界面的不同 */ -public abstract class AbstractSelectBox extends AbstractPopBox implements MouseListener { - private static final long serialVersionUID = 2355250206956896774L; - - private UIButton triggleButton; - - protected void initBox(int preWidth) { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - - displayComponent = new BackgroundJComponent(); - displayComponent.setEmptyBackground(); - triggleButton = new UIButton(UIConstants.ARROW_DOWN_ICON) { - public boolean shouldResponseChangeListener() { - return false; - } - - @Override - public ButtonUI getUI() { - return new UIButtonUI() { - @Override - protected boolean isPressed(AbstractButton b) { - return model.isArmed() && model.isPressed(); - } - - @Override - protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) { - if (isPressed(b) && b.isPressedPainted()) { - GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), UIConstants.COMBOBOX_BTN_PRESS); - } else if (isRollOver(b)) { - GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_ROLLOVER); - } else if (b.isNormalPainted()) { - GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_NORMAL); - } - } - }; - } - }; - triggleButton.setPreferredSize(new Dimension(20, 20)); - triggleButton.setRoundBorder(true, Constants.LEFT); - - JPanel displayPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - displayPane.add(displayComponent, BorderLayout.CENTER); - displayComponent.setPreferredSize(new Dimension(preWidth, displayPane.getPreferredSize().height)); - - displayComponent.addMouseListener(mouseListener); - triggleButton.addMouseListener(mouseListener); - displayComponent.addMouseListener(this); - triggleButton.addMouseListener(this); - - this.add(displayPane, BorderLayout.CENTER); - this.add(triggleButton, BorderLayout.EAST); - - this.addAncestorListener(new AncestorListener() { - public void ancestorAdded(AncestorEvent event) { - } - - public void ancestorRemoved(AncestorEvent evt) { - hidePopupMenu(); - } - - public void ancestorMoved(AncestorEvent event) { - hidePopupMenu(); - } - }); - - displayComponent.addMouseListener(new MouseAdapter() { - @Override - public void mouseExited(MouseEvent e) { - if (!isPopupVisible()) { - //如果弹出框==null 或者 弹出框不可见 直接return - return; - } - Point popMenuP = getControlWindow().getLocation(); - Point displayComponentP = displayComponent.getLocationOnScreen(); - if (popMenuP.getX() < displayComponentP.getX() - 1) { - //如果 弹出框横向超出屏幕 往左调整了 和displayComponent横向错开 就不处理了 - return; - } - - Rectangle rectangle = displayComponent.getBounds(); - boolean bottomPopAndExitTop = displayComponentP.getY() < popMenuP.getY() && e.getY() <= rectangle.y; - boolean topPopAndExitBottom = displayComponentP.getY() > popMenuP.getY() && e.getY() >= rectangle.y + rectangle.getHeight(); - boolean exitLeftOrRight = rectangle.x > e.getX() || rectangle.x + rectangle.getWidth() < e.getX(); - if (bottomPopAndExitTop || topPopAndExitBottom || exitLeftOrRight) { - //弹出框在displayComponent下面 且 鼠标是从displayComponent上面离开的，隐藏弹出界面。 - //弹出框在displayComponent上面 且 鼠标是从displayComponent下面离开的，隐藏弹出界面。 - //鼠标从displayComponent左边 或者 右边 离开，隐藏弹出界面。 - hidePopupMenu(); - } - - } - }); - } - - public void setEnabled(boolean enabled) { - super.setEnabled(enabled); - - displayComponent.setEnabled(enabled); - triggleButton.setEnabled(enabled); - } - - @Override - public JPanel initWindowPane(double preWidth) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void paint(Graphics g) { - super.paint(g); - Graphics2D g2d = (Graphics2D)g; - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(UIConstants.POP_DIALOG_BORDER); - g2d.drawRoundRect(0, 0, this.getWidth() - 1 , this.getHeight() - 1, 4, 4); - triggleButton.setSelected(isPopupVisible()); - } - - - public void addDemoPaneMouseListener(MouseListener l) { - displayComponent.addMouseListener(l); - triggleButton.addMouseListener(l); - } - - public abstract T getSelectObject(); - - public abstract void setSelectObject(T t); - - private class TriggleLineBorder extends AbstractBorder { - private static final long serialVersionUID = 1065857667981063530L; - protected Insets borderInsets = new Insets(0, 0, 0, 0); - - public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { - g.translate(x, y); - - g.setColor(UIConstants.POP_DIALOG_BORDER); - - g.translate(-x, -y); - } - - public Insets getBorderInsets(Component c) { - return borderInsets; - } - } - - @Override - public void mouseEntered(MouseEvent e) { - triggleButton.getModel().setRollover(true); - } - - @Override - public void mouseExited(MouseEvent e) { - triggleButton.getModel().setRollover(false); - } - - @Override - public void mouseClicked(MouseEvent e) { - // TODO Auto-generated method stub - - } - - @Override - public void mousePressed(MouseEvent e) { - // TODO Auto-generated method stub - - } - - @Override - public void mouseReleased(MouseEvent e) { - // TODO Auto-generated method stub - - } - +public abstract class AbstractSelectBox extends AbstractPopBox implements MouseListener, HoverAware { + private static final String UI_CLASS_ID = "SelectBoxUI"; + private static final long serialVersionUID = 2355250206956896774L; + + private boolean rollOver; + private JButton triggerButton; + + protected void initBox(int preWidth) { + // 初始化面板布局 + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + // 初始化组件 + displayComponent = new BackgroundJComponent(); + triggerButton = new SelectBoxButton(); + // 初始化组件布局 + JPanel displayPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + displayPane.setBorder(null); + displayPane.setOpaque(false); + displayPane.add(displayComponent, BorderLayout.CENTER); + displayComponent.setSize(new Dimension(FineUIScale.scale(preWidth), displayPane.getPreferredSize().height)); + // 添加事件监听 + displayComponent.addMouseListener(mouseListener); + triggerButton.addMouseListener(mouseListener); + displayComponent.addMouseListener(this); + triggerButton.addMouseListener(this); + + this.add(displayPane, BorderLayout.CENTER); + this.add(triggerButton, BorderLayout.EAST); + + this.addAncestorListener(new AncestorListener() { + public void ancestorAdded(AncestorEvent event) { + } + + public void ancestorRemoved(AncestorEvent evt) { + hidePopupMenu(); + } + + public void ancestorMoved(AncestorEvent event) { + hidePopupMenu(); + } + }); + + displayComponent.addMouseListener(new MouseAdapter() { + @Override + public void mouseExited(MouseEvent e) { + if (!isPopupVisible()) { + //如果弹出框==null 或者 弹出框不可见 直接return + return; + } + Point popMenuP = getControlWindow().getLocation(); + Point displayComponentP = displayComponent.getLocationOnScreen(); + if (popMenuP.getX() < displayComponentP.getX() - 1) { + //如果 弹出框横向超出屏幕 往左调整了 和displayComponent横向错开 就不处理了 + return; + } + + Rectangle rectangle = displayComponent.getBounds(); + boolean bottomPopAndExitTop = displayComponentP.getY() < popMenuP.getY() && e.getY() <= rectangle.y; + boolean topPopAndExitBottom = displayComponentP.getY() > popMenuP.getY() && e.getY() >= rectangle.y + rectangle.getHeight(); + boolean exitLeftOrRight = rectangle.x > e.getX() || rectangle.x + rectangle.getWidth() < e.getX(); + if (bottomPopAndExitTop || topPopAndExitBottom || exitLeftOrRight) { + //弹出框在displayComponent下面 且 鼠标是从displayComponent上面离开的，隐藏弹出界面。 + //弹出框在displayComponent上面 且 鼠标是从displayComponent下面离开的，隐藏弹出界面。 + //鼠标从displayComponent左边 或者 右边 离开，隐藏弹出界面。 + hidePopupMenu(); + } + + } + }); + } + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + + displayComponent.setEnabled(enabled); + triggerButton.setEnabled(enabled); + } + + @Override + public JPanel initWindowPane(double preWidth) { + return null; + } + + @Override + public void paint(Graphics g) { + super.paint(g); + triggerButton.setSelected(isPopupVisible()); + } + + /** + * 应用于SelectBox的右侧按钮 + */ + protected class SelectBoxButton extends FlatArrowButton { + + protected SelectBoxButton() { + this(SwingConstants.SOUTH, + UIManager.getString("Component.arrowType"), + UIManager.getColor("ComboBox.buttonArrowColor"), + UIManager.getColor("ComboBox.buttonDisabledArrowColor"), + null, null, null, null); + } + + protected SelectBoxButton(int direction, String type, Color foreground, Color disabledForeground, + Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground) { + super(direction, type, foreground, disabledForeground, + hoverForeground, hoverBackground, pressedForeground, pressedBackground); + } + + @Override + protected void paintArrow(Graphics2D g) { + if (isPopupVisible()) { + setDirection(SwingConstants.NORTH); + } else { + setDirection(SwingConstants.SOUTH); + } + super.paintArrow(g); + } + + @Override + public Dimension getPreferredSize() { + int outerHeight = FlatUIUtils.getUIInt("ComboBox.height", 24); + int buttonSize = FineUIScale.scale(outerHeight - + 2 * FlatUIUtils.getUIInt("Component.borderWidth", 1)); + return new Dimension(buttonSize, buttonSize); + } + } + + + public abstract T getSelectObject(); + + public abstract void setSelectObject(T t); + + + @Override + public void mouseEntered(MouseEvent e) { + rollOver = true; + repaint(); + } + + @Override + public void mouseExited(MouseEvent e) { + rollOver = false; + repaint(); + } + + @Override + public void mouseClicked(MouseEvent e) { + + } + + @Override + public void mousePressed(MouseEvent e) { + + } + + @Override + public void mouseReleased(MouseEvent e) { + + } + + @Override + public boolean isHovered() { + return rollOver; + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/style/BorderPane.java index c9dff2c3d2..18eb5b7a37 100644 --- a/designer-base/src/main/java/com/fr/design/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/style/BorderPane.java @@ -3,24 +3,26 @@ */ package com.fr.design.style; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.base.BaseUtils; import com.fr.base.CellBorderStyle; import com.fr.base.GraphHelper; import com.fr.base.Style; -import com.fr.design.border.UITitledBorder; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.VerticalFlowLayout; -import com.fr.design.style.color.ColorSelectBox; import com.fr.design.style.color.NewColorSelectBox; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.Constants; import com.fr.stable.CoreConstants; +import com.fr.stable.StringUtils; +import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.JComponent; @@ -29,17 +31,23 @@ import javax.swing.JToggleButton; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.EventListenerList; -import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * CellBorder Pane. */ @@ -73,97 +81,81 @@ public class BorderPane extends BasicPane { private LineComboBox currentLineCombo; private NewColorSelectBox currentLineColorPane; - - private UIButton insidebutton; + private JToggleButton insidebutton; public BorderPane() { this.initComponents(); } protected void initComponents() { - borderComponent = new BorderComponent(); - topToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"), BorderPane.TOP_BORDER); - horizontalToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"), BorderPane.HORIZONTAL_BORDER); - bottomToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"), BorderPane.BOTTOM_BORDER); + initBasicComponents(); + JPanel borderAllControlPane = initButtonPanel(); + JPanel borderLeftPane = column(5, flex(), cell(topToggleButton), cell(horizontalToggleButton), cell(bottomToggleButton), flex()).getComponent(); + JPanel borderBottomPane = row(5, flex(), cell(leftToggleButton), cell(verticalToggleButton), cell(rightToggleButton), flex()).getComponent(); + this.currentLineColorPane.setSelectObject(Color.BLUE); + Component northPane1 = initNorthPanel(); + Component centerPane1 = FineUIUtils.wrapComponentWithTitle(row(5, cell(borderLeftPane), + column(5, row(flex(), cell(borderAllControlPane),flex()), cell(borderComponent) + .with(it -> it.setPreferredSize(FineUIScale.scale(new Dimension(600, 300)))), cell(borderBottomPane)) + ).getComponent(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); + this.add(column(10, cell(northPane1), cell(centerPane1)).getComponent()); + } - leftToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"), BorderPane.LEFT_BORDER); - verticalToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), BorderPane.VERTICAL_BORDER); - rightToggleButton = new ToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), BorderPane.RIGHT_BORDER); + private void initBasicComponents() { + borderComponent = new BorderComponent(); + topToggleButton = new ToggleButton(new LazyIcon("top"), BorderPane.TOP_BORDER, false); + horizontalToggleButton = new ToggleButton(new LazyIcon("horizontal"), BorderPane.HORIZONTAL_BORDER, false); + bottomToggleButton = new ToggleButton(new LazyIcon("bottom"), BorderPane.BOTTOM_BORDER, false); + leftToggleButton = new ToggleButton(new LazyIcon("left"), BorderPane.LEFT_BORDER, true); + verticalToggleButton = new ToggleButton(new LazyIcon("vertical"), BorderPane.VERTICAL_BORDER, true); + rightToggleButton = new ToggleButton(new LazyIcon("right"), BorderPane.RIGHT_BORDER, true); this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY); this.currentLineColorPane = new NewColorSelectBox(100); - this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); this.setLayout(FRGUIPaneFactory.createBorderLayout()); - - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - - centerPane.setBorder(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))); - JPanel borderAllControlPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); - centerPane.add(borderAllControlPane, BorderLayout.NORTH); - borderAllControlPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 4, 0)); - borderAllControlPane.add(new UILabel(" ")); - // Button reseting borders - borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"))); - // Button setting all borders to active with - // current color and current style excepting inside borders - borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"))); - - borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"))); - - // Control - JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.add(borderPane, BorderLayout.CENTER); - borderPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 4)); - borderComponent.addBorderChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { fireStateChanged(); } }); + } - borderPane.add(borderComponent, BorderLayout.CENTER); - - JPanel borderLeftPane = new JPanel(); - JPanel borderCornerPane = new JPanel(); - JPanel borderBottomPane = new JPanel(); - - borderPane.add(borderLeftPane, BorderLayout.WEST); - JPanel tmpBorderBottomPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - borderPane.add(tmpBorderBottomPane, BorderLayout.SOUTH); - tmpBorderBottomPane.add(borderBottomPane, BorderLayout.CENTER); - tmpBorderBottomPane.add(borderCornerPane, BorderLayout.WEST); - - borderLeftPane.setLayout(new VerticalFlowLayout(VerticalFlowLayout.CENTER, 4, 16)); - - borderLeftPane.add(topToggleButton); - borderLeftPane.add(horizontalToggleButton); - borderLeftPane.add(bottomToggleButton); - - borderBottomPane.setLayout(new /**/FlowLayout(FlowLayout.CENTER, 42, 5)); - borderBottomPane.add(leftToggleButton); - borderBottomPane.add(verticalToggleButton); - borderBottomPane.add(rightToggleButton); - - borderCornerPane.setPreferredSize(new Dimension(borderLeftPane.getPreferredSize().width, borderBottomPane.getPreferredSize().height)); - - JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - - northPane.setBorder(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Line"))); - JPanel rightTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - northPane.add(rightTopPane, BorderLayout.NORTH); - JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style") + ":")); - first.add(this.currentLineCombo); - rightTopPane.add(first, BorderLayout.NORTH); - - JPanel second = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + ":")); + private JPanel initButtonPanel() { + JToggleButton button1 = createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No")); + JToggleButton button2 = createVerButtonPane(EXTERNAL_BORDERS, ""); + JToggleButton button3 = createVerButtonPane(INSIDE_BORDERS, ""); + ItemListener itemListener = e -> { + AbstractButton button = (AbstractButton) e.getSource(); + if (e.getStateChange() == ItemEvent.SELECTED) { + if (button == button1) { + if (button2.isSelected()) { + button2.setSelected(false); + } + if (button3.isSelected()) { + button3.setSelected(false); + } + } else if (button == button2 || button == button3) { + if (button1.isSelected()) { + button1.setSelected(false); + } + } + } + }; + button1.addItemListener(itemListener); + button2.addItemListener(itemListener); + button3.addItemListener(itemListener); + return row(5, cell(button1), cell(button2), cell(button3)).getComponent(); + } - second.add(this.currentLineColorPane); - rightTopPane.add(second, BorderLayout.CENTER); - this.currentLineColorPane.setSelectObject(Color.BLACK); - this.add(northPane, BorderLayout.NORTH); - this.add(centerPane, BorderLayout.CENTER); + private Component initNorthPanel() { + return FineUIUtils.wrapComponentWithTitle(column( + 10, row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style"))).weight(0.1), + cell(this.currentLineCombo).weight(0.25), + flex(0.5)), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"))).weight(0.1), + cell(this.currentLineColorPane).weight(0.25), + flex(0.5)) + ).getComponent(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Line")); } public void addChangeListener(ChangeListener changeListener) { @@ -186,15 +178,16 @@ public class BorderPane extends BasicPane { } } - private JPanel createVerButtonPane(int display, String text) { + private JToggleButton createVerButtonPane(int display, String text) { JPanel verPane = new JPanel(); - verPane.setLayout(new VerticalFlowLayout(VerticalFlowLayout.CENTER, 2, 2)); BorderButton button = new BorderButton(display); + if (StringUtils.isNotEmpty(text)) { + button.setText(text); + } verPane.add(button); - verPane.add(new UILabel(text)); insidebutton = button; - return verPane; + return button; } private void refreshAllToggleButtons() { @@ -206,14 +199,6 @@ public class BorderPane extends BasicPane { rightToggleButton.setSelected(this.cellBorderStyle.getRightStyle() != Constants.LINE_NONE); } - public CellBorderStyle getCellBorderStyle() { - return this.cellBorderStyle; - } - - public void setCellBorderStyle(CellBorderStyle cellBorderStyle) { - this.cellBorderStyle = cellBorderStyle; - } - @Override protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"); @@ -282,11 +267,18 @@ public class BorderPane extends BasicPane { private class ToggleButton extends JToggleButton implements ActionListener { private int borderType = 0; - public ToggleButton(Icon icon, int borderType) { + /** + * 根据水平 或者 垂直布局设置控件大小 + */ + public ToggleButton(Icon icon, int borderType, boolean horizontal) { super(icon); this.borderType = borderType; - this.setPreferredSize(new Dimension(32, 32)); + if (horizontal) { + this.setPreferredSize(FineUIScale.scale(new Dimension(40, 24))); + } else { + this.setPreferredSize(FineUIScale.scale(new Dimension(24, 40))); + } this.addActionListener(this); } @@ -335,18 +327,18 @@ public class BorderPane extends BasicPane { } // Shortcut setting button - private class BorderButton extends UIButton implements ActionListener { + private class BorderButton extends JToggleButton implements ActionListener { private int border; private BorderButton(int border) { this.border = border; if (border == BorderPane.EXTERNAL_BORDERS) { - this.setIcon(BaseUtils.readIcon("com/fr/design/images/m_format/out.png")); + this.setIcon(new LazyIcon("out")); } else if(border == BorderPane.INSIDE_BORDERS) { - this.setIcon(BaseUtils.readIcon("com/fr/design/images/m_format/in.png")); + this.setIcon(new LazyIcon("in")); } + this.setPreferredSize(FineUIScale.scale(new Dimension(40, 24))); this.addActionListener(this); - setPreferredSize(new Dimension(32, 32)); setFocusPainted(false); } @@ -613,16 +605,16 @@ public class BorderPane extends BasicPane { int pInset = 4; int pWidth = this.getWidth() / 2 - 20 - pInset; int pHeight = this.getHeight() / 2 - 20 - pInset; - g.setColor(Color.lightGray); + g.setColor(FlatUIUtils.getUIColor("fill.hover", new Color(230,233,239))); g.fillRect(20, 20, pWidth, pHeight); - g.setColor(Color.lightGray); + g.setColor(FlatUIUtils.getUIColor("fill.hover", new Color(230,233,239))); g.fillRect(this.getWidth() / 2 + pInset + 1, 20, pWidth, pHeight); - g.setColor(Color.lightGray); + g.setColor(FlatUIUtils.getUIColor("fill.hover", new Color(230,233,239))); g.fillRect(20, this.getHeight() / 2 + pInset + 1, pWidth, pHeight); - g.setColor(Color.lightGray); + g.setColor(FlatUIUtils.getUIColor("fill.hover", new Color(230,233,239))); g.fillRect(this.getWidth() / 2 + pInset + 1, this.getHeight() / 2 + pInset + 1, pWidth, pHeight); } else { - g.setColor(Color.lightGray); + g.setColor(FlatUIUtils.getUIColor("fill.hover", new Color(230,233,239))); g.fillRect(20, 20, this.getWidth() - 40, this.getHeight() - 40); } updateBorders(g); diff --git a/designer-base/src/main/java/com/fr/design/style/FRFontPane.java b/designer-base/src/main/java/com/fr/design/style/FRFontPane.java index 04b285fd56..091cedaeeb 100644 --- a/designer-base/src/main/java/com/fr/design/style/FRFontPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FRFontPane.java @@ -7,29 +7,24 @@ import com.fr.base.FRContext; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.LineComboBox; +import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.color.ColorSelectBox; -import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.design.utils.DesignUtils; import com.fr.general.DefaultValues; import com.fr.general.FRFont; import com.fr.stable.CoreConstants; import javax.swing.BorderFactory; import javax.swing.Box; -import javax.swing.JComponent; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import javax.swing.event.EventListenerList; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; -import java.awt.BorderLayout; import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -38,17 +33,24 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * Pane to edit Font. */ public class FRFontPane extends BasicPane { - private FontFamilyPane familyPane; private FontSizeStylePane fontSizeStylePane; //foreground. private ColorSelectBox foregroundColorPane; + private UIComboBox fontNameComboBox; + //underline private LineComboBox underlineCombo; @@ -76,88 +78,36 @@ public class FRFontPane extends BasicPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); - - // 纵向布局 放置list 和 下划线 颜色 - JPanel listVPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); - this.add(listVPane, BorderLayout.NORTH); - - JPanel listHPane =FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); - listVPane.add(listHPane); // 名字 - familyPane = new FontFamilyPane(); - listHPane.add(familyPane); + fontNameComboBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report()); + this.fontNameComboBox.addActionListener(actionListener); // 字形和大小 fontSizeStylePane = new FontSizeStylePane(); - listHPane.add(fontSizeStylePane); - - fontSizeStylePane.getStyleList().addListSelectionListener(listSelectionListener); - - //Richie:直接输入FRFont的size. - fontSizeStylePane.getSizeField().getDocument().addDocumentListener(documentListener); - fontSizeStylePane.getSizeField().getDocument().addDocumentListener(new DocumentListener() { - public void changedUpdate(DocumentEvent e) {// 这是更改操作的处理 - updatePreviewLabel(); - } - - public void insertUpdate(DocumentEvent e) {// 这是插入操作的处理 - updatePreviewLabel(); - } - - public void removeUpdate(DocumentEvent e) {// 这是删除操作的处理 - updatePreviewLabel(); - } - }); - - fontSizeStylePane.getSizeList().addListSelectionListener(listSelectionListener); // 下划线 和 颜色 - JPanel listVBottomPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); - listVPane.add(listVBottomPane); - - - // underline pane - JPanel underlinePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - listVBottomPane.add(underlinePane); - underlinePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Underline"), null)); - this.underlineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY); this.underlineCombo.addActionListener(actionListener); - underlinePane.add(this.underlineCombo, BorderLayout.CENTER); - - // foreground - JPanel foregroundPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - listVBottomPane.add(foregroundPane); - - foregroundPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Foreground"),null)); foregroundColorPane = new ColorSelectBox(140); foregroundColorPane.addSelectChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { fireStateChanged(); } }); - foregroundPane.add(foregroundColorPane, BorderLayout.WEST); - // center pane - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(centerPane, BorderLayout.CENTER); - centerPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - - // other reportFont dialog - JPanel otherFontPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.add(otherFontPane, BorderLayout.WEST); -// otherFontPane.setLayout(FRGUIPaneFactory.createBorderLayout()); + initCheckbox(); + // preview pane. + preview = new FRFontPreviewArea(); - // effects pane - JPanel effectsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - otherFontPane.add(effectsPane, BorderLayout.CENTER); -// effectsPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - effectsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Effects"),null)); + //peteter:这里主动从Context, 获得默认的FRFont的值. + DefaultValues defaultValues = FRContext.getDefaultValues(); + populate(defaultValues.getFRFont()); - JPanel effectsPane2 = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); - effectsPane.add(effectsPane2, BorderLayout.NORTH); + addCenterPanel(); + } + private void initCheckbox() { isStrikethroughCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Strikethrough") + " "); isStrikethroughCheckBox.addChangeListener(changeListener); isStrikethroughCheckBox.setMnemonic('K'); @@ -170,23 +120,6 @@ public class FRFontPane extends BasicPane { isSubscriptCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Subscript")); isSubscriptCheckBox.addChangeListener(changeListener); isSubscriptCheckBox.setMnemonic('B'); - - effectsPane2.add(this.getLeftJustPane(isStrikethroughCheckBox)); - effectsPane2.add(this.getLeftJustPane(isShadowCheckBox)); - effectsPane2.add(this.getLeftJustPane(isSuperscriptCheckBox)); - effectsPane2.add(this.getLeftJustPane(isSubscriptCheckBox)); - - // right pane - JPanel rightPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.add(rightPane, BorderLayout.CENTER); - -// rightPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - - // preview pane. - preview = new FRFontPreviewArea(); - preview.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))); - rightPane.add(preview, BorderLayout.CENTER); - // Cannot select superscript and subscript in the same time. this.isSuperscriptCheckBox.addChangeListener(changeListener); this.isSuperscriptCheckBox.addChangeListener(new ChangeListener() { @@ -204,10 +137,34 @@ public class FRFontPane extends BasicPane { } } }); + } - //peteter:这里主动从Context, 获得默认的FRFont的值. - DefaultValues defaultValues = FRContext.getDefaultValues(); - populate(defaultValues.getFRFont()); + private void addCenterPanel() { + add(column(10, + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Family"))).weight(0.1), + cell(fontNameComboBox).weight(0.2), + flex(0.4) + ), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"))).weight(0.1), + cell(fontSizeStylePane.fontComboBox).weight(0.25), + fix(5), + cell(fontSizeStylePane.fontSizeComboBox).weight(0.2), + flex(0.15) + ), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Underline"))).weight(0.1), + cell(underlineCombo).weight(0.2), + flex(0.4) + ), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Foreground"))).weight(0.1), + cell(foregroundColorPane).weight(0.2), + flex(0.4) + ), + row(cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Effects"))).weight(0.1), + row(cell(this.isStrikethroughCheckBox), fix(5), cell(this.isShadowCheckBox), fix(5), + cell(this.isSuperscriptCheckBox), fix(5), cell(this.isSubscriptCheckBox), flex()).weight(0.6) + ), + column(5, cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))), cell(preview).weight(1)).weight(1) + ).getComponent()); } public void addChangeListener(ChangeListener changeListener) { @@ -242,37 +199,6 @@ public class FRFontPane extends BasicPane { } }; - ListSelectionListener listSelectionListener = new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - fireStateChanged(); - } - }; - - DocumentListener documentListener = new DocumentListener() { - public void changedUpdate(DocumentEvent e) { - fireStateChanged(); - } - - public void insertUpdate(DocumentEvent e) { - fireStateChanged(); - } - - public void removeUpdate(DocumentEvent e) { - fireStateChanged(); - } - }; - - //use the method to make all checkbox donot margin == 0. - private JPanel getLeftJustPane(JComponent comp) { - JPanel leftJustPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); -// leftJustPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - leftJustPane.add(comp, BorderLayout.CENTER); - - leftJustPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0)); - - return leftJustPane; - } - @Override protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_FRFont"); @@ -282,27 +208,8 @@ public class FRFontPane extends BasicPane { * Use font to populate pane. */ public void populate(FRFont frFont) { - familyPane.populate(frFont); - - fontSizeStylePane.populate(frFont); - - //foreground. - this.foregroundColorPane.setSelectObject(frFont.getForeground()); - //update frFont. - this.underlineCombo.setSelectedLineStyle(frFont.getUnderline()); - - //effects - this.isStrikethroughCheckBox.setSelected(frFont.isStrikethrough()); - this.isShadowCheckBox.setSelected(frFont.isShadow()); - this.isSuperscriptCheckBox.setSelected(frFont.isSuperscript()); - this.isSubscriptCheckBox.setSelected(frFont.isSubscript()); - //添加ListHandler. - ListHandler listHandler = new ListHandler(); - - familyPane.addListSelectionListener(listHandler); - fontSizeStylePane.getStyleList().addListSelectionListener(listHandler); - fontSizeStylePane.getSizeList().addListSelectionListener(listHandler); + populateFont(frFont); //actionlistner ActionListener updatePreviewActionListener = new ActionListener() { @@ -315,7 +222,7 @@ public class FRFontPane extends BasicPane { this.isSuperscriptCheckBox.addActionListener(updatePreviewActionListener); this.isSubscriptCheckBox.addActionListener(updatePreviewActionListener); -//underline + //underline this.underlineCombo.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { updatePreviewLabel(); @@ -332,17 +239,34 @@ public class FRFontPane extends BasicPane { updatePreviewLabel(); } + private void populateFont(FRFont frFont) { + this.fontNameComboBox.setSelectedItem(frFont.getName()); + // 字体 + this.fontSizeStylePane.populate(frFont); + //foreground. + this.foregroundColorPane.setSelectObject(frFont.getForeground()); + //update frFont. + this.underlineCombo.setSelectedLineStyle(frFont.getUnderline()); + + //effects + this.isStrikethroughCheckBox.setSelected(frFont.isStrikethrough()); + this.isShadowCheckBox.setSelected(frFont.isShadow()); + this.isSuperscriptCheckBox.setSelected(frFont.isSuperscript()); + this.isSubscriptCheckBox.setSelected(frFont.isSubscript()); + } + + /** * Update pane to get new font. */ public FRFont update() { - double fs = fontSizeStylePane.getSizeField().getValue(); + double fs = (double)((int)fontSizeStylePane.fontSizeComboBox.getSelectedItem()); if (!(fs + "").endsWith(".5")) { fs = (int)fs; } - return FRFont.getInstance(this.familyPane.getText(), - this.fontSizeStylePane.getStyleList().getSelectedIndex(), - (float)fs, + return FRFont.getInstance((String) this.fontNameComboBox.getSelectedItem(), + this.fontSizeStylePane.fontComboBox.getSelectedIndex(), + (float)((int)fontSizeStylePane.fontSizeComboBox.getSelectedItem()), this.foregroundColorPane.getSelectObject(), this.underlineCombo.getSelectedLineStyle(), @@ -393,10 +317,4 @@ public class FRFontPane extends BasicPane { private void updatePreviewLabel() { preview.setFontObject(this.update()); } - - class ListHandler implements ListSelectionListener { - public void valueChanged(ListSelectionEvent evt) { - updatePreviewLabel(); - } - } } diff --git a/designer-base/src/main/java/com/fr/design/style/FontFamilyPane.java b/designer-base/src/main/java/com/fr/design/style/FontFamilyPane.java index ba496ae138..7213c819cd 100644 --- a/designer-base/src/main/java/com/fr/design/style/FontFamilyPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FontFamilyPane.java @@ -1,6 +1,8 @@ package com.fr.design.style; import com.fr.base.Utils; +import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.DesignUtils; @@ -13,32 +15,35 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import java.awt.BorderLayout; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + public class FontFamilyPane extends JPanel { private UITextField familyField; private JList familyList; + private UIComboBox familyComBox; + public FontFamilyPane() { this.init(); } private void init() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setLayout(new BorderLayout()); // 名字 familyField = new UITextField(); familyField.setEditable(false); familyList = new JList(DesignUtils.getAvailableFontFamilyNames4Report()); familyList.setVisibleRowCount(4); - - familyList.addListSelectionListener(listener); - - JPanel familyPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); -// familyPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - familyPane.add(FRFontPane.createTextFieldListPane("", familyField, familyList), BorderLayout.CENTER); - familyPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Family"),null)); + familyComBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report()); - this.add(familyPane); + familyList.addListSelectionListener(listener); + this.add(row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Family"))).weight(0.1), + cell(familyComBox).weight(0.4) + ).getComponent()); } ListSelectionListener listener = new ListSelectionListener() { diff --git a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java index 2fa5acf578..255d9e2301 100644 --- a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java +++ b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java @@ -1,106 +1,50 @@ package com.fr.design.style; - -import javax.swing.Box; -import javax.swing.JList; import javax.swing.JPanel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; -import com.fr.design.gui.itextfield.UINumberField; -import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.FRFont; -import com.fr.design.utils.gui.GUICoreUtils; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; public class FontSizeStylePane extends JPanel { + public UIComboBox fontComboBox; + public UIComboBox fontSizeComboBox; + + private static final String[] STYLES = { + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")}; - private UINumberField sizeField; - private JList sizeList; - private UITextField styleField; - private JList styleList; - public FontSizeStylePane() { this.init(); } private void init() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - - JPanel fontVSizPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - this.add(fontVSizPane); - -// fontVSizPane.setLayout(new BoxLayout(fontVSizPane, BoxLayout.X_AXIS)); - fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"), null)); - - String[] styles = { - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")}; - - styleField = new UITextField(); - styleField.setEditable(false); - - styleList = new JList(styles); - styleList.setVisibleRowCount(4); - - JPanel stylePanel = FRFontPane.createTextFieldListPane("", styleField, styleList); - fontVSizPane.add(stylePanel); - - fontVSizPane.add(Box.createHorizontalStrut(6)); - - JPanel sizePanel = FRFontPane.createTextFieldListPane("", sizeField = new UINumberField(), sizeList = new JList(FRFontPane.Font_Sizes)); - sizeField.setMaxDecimalLength(1); - - sizeField.setEditable(false); - - sizeList.setVisibleRowCount(4); - - fontVSizPane.add(sizePanel); - - styleField.setText((String) styleList.getSelectedValue()); - - sizeList.addListSelectionListener(listener); - styleList.addListSelectionListener(listener); - + fontComboBox = new UIComboBox(STYLES); + fontSizeComboBox = new UIComboBox(FRFontPane.Font_Sizes); + + this.add(row( + 10, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"))).weight(0.1), + cell(fontComboBox).weight(0.2), + cell(fontSizeComboBox).weight(0.2), + flex(0.2) + ).getComponent()); } - - ListSelectionListener listener = new ListSelectionListener() { - public void valueChanged(ListSelectionEvent evt) { - Object source = evt.getSource(); - if (source == getSizeList()) { - Integer size = (Integer) getSizeList().getSelectedValue(); - if (size != null) { - getSizeField().setValue(size.intValue()); - } - } else if (source == getStyleList()) { - String style = (String) getStyleList().getSelectedValue(); - if (style != null) getStyleField().setText(style); - } - } - }; - - public UINumberField getSizeField() { - return sizeField; - } - - public JList getStyleList() { - return styleList; - } - - public JList getSizeList() { - return sizeList; - } - - public UITextField getStyleField() { - return styleField; - } - + + /** + * Populate + * @param frFont + */ public void populate(FRFont frFont) { - styleList.setSelectedIndex(frFont.getStyle()); - sizeList.setSelectedValue(new Integer(frFont.getSize()), true); - sizeField.setValue(frFont.getSize2D()); + fontComboBox.setSelectedItem(STYLES[frFont.getStyle()]); + fontSizeComboBox.setSelectedItem(frFont.getSize()); } } diff --git a/designer-base/src/main/java/com/fr/design/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/style/FormatPane.java index f1d7a086bd..dad1087361 100644 --- a/designer-base/src/main/java/com/fr/design/style/FormatPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FormatPane.java @@ -3,6 +3,10 @@ */ package com.fr.design.style; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.FRContext; import com.fr.base.TextFormat; import com.fr.data.core.FormatField; @@ -18,9 +22,10 @@ import com.fr.general.ComparatorUtils; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; import javax.swing.ButtonGroup; +import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; +import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -32,6 +37,7 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.Component; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -40,6 +46,11 @@ import java.text.Format; import java.text.SimpleDateFormat; import java.util.Date; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 属性界面中的格式面板 */ @@ -79,55 +90,74 @@ public class FormatPane extends BasicPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); + this.setBorder(new ScaledEmptyBorder(4, 4, 4, 4)); //sample pane + JPanel samplePane = initSamplePane(); + initRadioButton(); + initRadioButtonGroup(); + initPattern(); + //init values. + nullRadioButton.setSelected(true); + this.applyRadioActionListener(this.nullRadioButton); + + JScrollPane scrollPane = initPatternScrollPanel(); + this.add(column( + 10, + cell(samplePane), + row(10, + column( + 10, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Format_Category"))).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, 0, 0))), + cell(initLeftControlPane()), + flex() + ).weight(0.1), + column( + 10, + cell(patternTextField), + cell(scrollPane).weight(1) + ).weight(0.5) + ).weight(1) + ).getComponent()); + } + + private JPanel initSamplePane() { JPanel samplePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(samplePane, BorderLayout.NORTH); samplePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_StyleFormat_Sample"), null)); samplePane.setLayout(FRGUIPaneFactory.createBorderLayout()); sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()); samplePane.add(sampleLabel, BorderLayout.CENTER); - sampleLabel.setBorder(BorderFactory.createEmptyBorder(2, 4, 4, 4)); + sampleLabel.setBorder(new ScaledEmptyBorder(10, 0, 10, 0)); sampleLabel.setHorizontalAlignment(SwingConstants.CENTER); sampleLabel.setFont(FRContext.getDefaultValues().getFRFont()); - //left control pane - JPanel leftControlPane =FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); - this.add(leftControlPane, BorderLayout.WEST); - leftControlPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Format_Category"), null)); - initRadioButton(); - ButtonGroup categoryButtonGroup = new ButtonGroup(); - categoryButtonGroup.add(nullRadioButton); - categoryButtonGroup.add(numberRadioButton); - categoryButtonGroup.add(currencyRadioButton); - categoryButtonGroup.add(percentRadioButton); - categoryButtonGroup.add(thousandthsRadioButton); - categoryButtonGroup.add(scientificRadioButton); - categoryButtonGroup.add(dateRadioButton); - categoryButtonGroup.add(timeRadioButton); - categoryButtonGroup.add(textRadioButton); + return samplePane; + } - leftControlPane.add(this.createRadioCenterPane(nullRadioButton)); - leftControlPane.add(this.createRadioCenterPane(numberRadioButton)); - leftControlPane.add(this.createRadioCenterPane(currencyRadioButton)); - leftControlPane.add(this.createRadioCenterPane(percentRadioButton)); - leftControlPane.add(this.createRadioCenterPane(thousandthsRadioButton)); - leftControlPane.add(this.createRadioCenterPane(scientificRadioButton)); - leftControlPane.add(this.createRadioCenterPane(dateRadioButton)); - leftControlPane.add(this.createRadioCenterPane(timeRadioButton)); - leftControlPane.add(this.createRadioCenterPane(textRadioButton)); - //content pane. - JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(contentPane, BorderLayout.CENTER); - contentPane.setBorder(BorderFactory.createEmptyBorder(4, 0, 2, 0)); + private void initPattern() { patternTextField = new UITextField(); - contentPane.add(patternTextField, BorderLayout.NORTH); patternTextField.getDocument().addDocumentListener(patternTextDocumentListener); patternList = new JList(new DefaultListModel()); - contentPane.add(new JScrollPane(patternList), BorderLayout.CENTER); + patternList.setCellRenderer(new DefaultListCellRenderer(){ + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + JLabel renderer = (JLabel)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + list.setSelectionBackground(UIManager.getColor("List.selectBackgroundColor")); + setOpaque(true); + if (isSelected) { + renderer.setBackground(list.getSelectionBackground()); + } else { + renderer.setBackground(list.getBackground()); + } + return renderer; + } + }); + patternList.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); patternList.addListSelectionListener(patternListSelectionListener); - //init values. - nullRadioButton.setSelected(true); - this.applyRadioActionListener(this.nullRadioButton); + } + + private JScrollPane initPatternScrollPanel() { + JScrollPane scrollPane = new JScrollPane(patternList); + scrollPane.setBorder(new FineRoundBorder()); + return scrollPane; } private void initRadioButton () { @@ -161,6 +191,32 @@ public class FormatPane extends BasicPane { textRadioButton.addActionListener(radioActionListener); } + private void initRadioButtonGroup() { + ButtonGroup categoryButtonGroup = new ButtonGroup(); + categoryButtonGroup.add(nullRadioButton); + categoryButtonGroup.add(numberRadioButton); + categoryButtonGroup.add(currencyRadioButton); + categoryButtonGroup.add(percentRadioButton); + categoryButtonGroup.add(thousandthsRadioButton); + categoryButtonGroup.add(scientificRadioButton); + categoryButtonGroup.add(dateRadioButton); + categoryButtonGroup.add(timeRadioButton); + categoryButtonGroup.add(textRadioButton); + } + + private JPanel initLeftControlPane() { + JPanel leftControlPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); + leftControlPane.add(this.createRadioCenterPane(nullRadioButton)); + leftControlPane.add(this.createRadioCenterPane(numberRadioButton)); + leftControlPane.add(this.createRadioCenterPane(currencyRadioButton)); + leftControlPane.add(this.createRadioCenterPane(percentRadioButton)); + leftControlPane.add(this.createRadioCenterPane(thousandthsRadioButton)); + leftControlPane.add(this.createRadioCenterPane(scientificRadioButton)); + leftControlPane.add(this.createRadioCenterPane(dateRadioButton)); + leftControlPane.add(this.createRadioCenterPane(timeRadioButton)); + leftControlPane.add(this.createRadioCenterPane(textRadioButton)); + return leftControlPane; + } /** * Create radio center pane. */ @@ -168,7 +224,6 @@ public class FormatPane extends BasicPane { JPanel pane = new JPanel(); pane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); - pane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0)); pane.add(radioButton); return pane; diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundButtonPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundButtonPane.java index 2ffe5ccadb..4dd7ebab4d 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundButtonPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundButtonPane.java @@ -19,7 +19,7 @@ public class BackgroundButtonPane extends BackgroundPane { for (Class key : BackgroundFactory.buttonKindsOfKey()) { BackgroundUIWrapper wrapper = BackgroundFactory.getButtonWrapper(key); wrapper.setIndex(index++); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPaneBuilder.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), getTabItemPaneByIndex(wrapper.getIndex())); } } @@ -31,11 +31,7 @@ public class BackgroundButtonPane extends BackgroundPane { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { quickPane = BackgroundFactory.createButtonIfAbsent(background == null ? null : background.getClass()); - quickPane.addChangeListener(backgroundChangeListener); - cacheMap.put(index, quickPane); } - tabbedPane.setComponentAt(index, quickPane); - tabbedPane.setSelectedIndex(index); return quickPane; } @@ -43,9 +39,7 @@ public class BackgroundButtonPane extends BackgroundPane { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { quickPane = BackgroundFactory.createButtonIfAbsent(index); - tabbedPane.setComponentAt(index, quickPane); cacheMap.put(index, quickPane); - quickPane.addChangeListener(backgroundChangeListener); } return quickPane; } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java index ed8afc9e4d..9eb384ab55 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java @@ -47,7 +47,7 @@ public class BackgroundCardSwitchButtonPane extends BackgroundButtonPane { for (Class key : cardSwitchButton.keySet()) { BackgroundUIWrapper wrapper = cardSwitchButton.get(key); wrapper.setIndex(index++); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPaneBuilder.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), getTabItemPaneByIndex(wrapper.getIndex())); } } @@ -63,11 +63,8 @@ public class BackgroundCardSwitchButtonPane extends BackgroundButtonPane { if (quickPane == null) { BackgroundUIWrapper uiWrapper = getBackgroundUIWrapper(background); quickPane = BackgroundFactory.createByWrapper(uiWrapper); - quickPane.addChangeListener(backgroundChangeListener); cacheMap.put(index, quickPane); } - tabbedPane.setComponentAt(index, quickPane); - tabbedPane.setSelectedIndex(index); return quickPane; } @@ -76,9 +73,7 @@ public class BackgroundCardSwitchButtonPane extends BackgroundButtonPane { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { quickPane = createDetailPaneByIndex(index); - tabbedPane.setComponentAt(index, quickPane); cacheMap.put(index, quickPane); - quickPane.addChangeListener(backgroundChangeListener); } return quickPane; } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundJComponent.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundJComponent.java index 611953a20b..66a6b9045c 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundJComponent.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundJComponent.java @@ -1,12 +1,9 @@ package com.fr.design.style.background; -import java.awt.Color; import java.awt.Graphics; import java.awt.Insets; import java.awt.geom.Rectangle2D; - import javax.swing.JComponent; -import com.fr.design.border.UIRoundedBorder; import com.fr.general.Background; /** @@ -20,7 +17,6 @@ public class BackgroundJComponent extends JComponent { protected Background background ; public BackgroundJComponent() { - this.setBorder(new UIRoundedBorder(Color.decode("#999999"), 2, 2)); } public BackgroundJComponent(Background background) { @@ -37,7 +33,6 @@ public class BackgroundJComponent extends JComponent { } - public void setEmptyBackground() { this.background = null; } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java index ebaf04e32a..7099ed7652 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java @@ -3,13 +3,13 @@ */ package com.fr.design.style.background; -import java.awt.BorderLayout; import java.awt.Dimension; import java.util.HashMap; import java.util.Map; +import com.fine.theme.utils.FineUIScale; import com.fr.base.background.ColorBackground; -import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.design.gui.frpane.FineTabbedPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -23,10 +23,14 @@ import com.fr.design.style.background.impl.ColorNoThemeBackgroundPane; import com.fr.general.Background; import com.fr.log.FineLoggerFactory; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + public class BackgroundPane extends BasicPane { - protected UITabbedPane tabbedPane = null; + protected FineTabbedPane.TabPaneBuilder tabbedPaneBuilder = new FineTabbedPane.TabPaneBuilder(); + protected FineTabbedPane tabbedPane = null; private EventListenerList eventChangeList = new EventListenerList(); protected Map cacheMap = new HashMap<>(); @@ -37,26 +41,15 @@ public class BackgroundPane extends BasicPane { BackgroundFactory.getWrapper(ColorBackground.class).setType( DesignerContext.getDesignerFrame().isServerConfig() ? ColorNoThemeBackgroundPane.class : ColorBackgroundPane.class); this.initComponents(); - this.setPreferredSize(new Dimension(400, 300)); + this.setPreferredSize(FineUIScale.scale(new Dimension(400, 300))); } protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - - previewPane = new BackgroundPreviewLabel(); - previewPane.addBackgroundChangeListener(new ChangeListener() { - - public void stateChanged(ChangeEvent e) { - fireStateChanged(); - } - }); - tabbedPane = new UITabbedPane(); - this.add(tabbedPane, BorderLayout.CENTER); - initTabPane(); + tabbedPane = tabbedPaneBuilder.withHeadRatio(0.65f).build(); - tabbedPane.addChangeListener(backgroundChangeListener); - tabbedPane.setPreferredSize(new Dimension(200, 210)); + add(cell(tabbedPane).weight(1).getComponent()); } protected void initTabPane() { @@ -64,7 +57,7 @@ public class BackgroundPane extends BasicPane { for (Class key : BackgroundFactory.kindsOfKey()) { BackgroundUIWrapper wrapper = BackgroundFactory.getWrapper(key); wrapper.setIndex(index++); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPaneBuilder.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), getTabItemPaneByIndex(wrapper.getIndex())); } } @@ -98,11 +91,8 @@ public class BackgroundPane extends BasicPane { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { quickPane = BackgroundFactory.createIfAbsent(background == null ? null : background.getClass()); - quickPane.addChangeListener(backgroundChangeListener); cacheMap.put(index, quickPane); } - tabbedPane.setComponentAt(index, quickPane); - tabbedPane.setSelectedIndex(index); return quickPane; } @@ -110,9 +100,7 @@ public class BackgroundPane extends BasicPane { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { quickPane = BackgroundFactory.createIfAbsent(index); - tabbedPane.setComponentAt(index, quickPane); cacheMap.put(index, quickPane); - quickPane.addChangeListener(backgroundChangeListener); } return quickPane; } @@ -129,9 +117,6 @@ public class BackgroundPane extends BasicPane { int index = wrapper.getIndex(); BackgroundDetailPane quickPane = getTabItemPane(background, index); quickPane.populate(background); - - tabbedPane.doLayout(); - tabbedPane.validate(); } protected BackgroundUIWrapper getBackgroundUIWrapper(Background background) { @@ -151,16 +136,5 @@ public class BackgroundPane extends BasicPane { } return null; } - /** - * Change listener. - */ - protected ChangeListener backgroundChangeListener = new ChangeListener() { - - public void stateChanged(ChangeEvent evt) { - previewPane.setBackgroundObject(update()); - previewPane.repaint(); - } - }; - private BackgroundPreviewLabel previewPane = null; } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane4Browser.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane4Browser.java index d6cae505b5..8aca7bac53 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane4Browser.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane4Browser.java @@ -18,7 +18,7 @@ public class BackgroundPane4Browser extends BackgroundPane { for (Class key : BackgroundFactory.browserKindsOfKey()) { BackgroundUIWrapper wrapper = BackgroundFactory.getBrowserWrapper(key); wrapper.setIndex(index++); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPaneBuilder.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), getTabItemPaneByIndex(wrapper.getIndex())); } } @@ -30,11 +30,8 @@ public class BackgroundPane4Browser extends BackgroundPane { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { quickPane = BackgroundFactory.createBrowserIfAbsent(background == null ? null : background.getClass()); - quickPane.addChangeListener(backgroundChangeListener); cacheMap.put(index, quickPane); } - tabbedPane.setComponentAt(index, quickPane); - tabbedPane.setSelectedIndex(index); return quickPane; } @@ -42,9 +39,7 @@ public class BackgroundPane4Browser extends BackgroundPane { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { quickPane = BackgroundFactory.createBrowserIfAbsent(index); - tabbedPane.setComponentAt(index, quickPane); cacheMap.put(index, quickPane); - quickPane.addChangeListener(backgroundChangeListener); } return quickPane; } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java index 08d2a2e6a4..3e58ac12a3 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java @@ -44,7 +44,7 @@ public class BackgroundTabPane extends BackgroundPane { for (Class key : tabpane.keySet()) { BackgroundUIWrapper wrapper = tabpane.get(key); wrapper.setIndex(index++); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPaneBuilder.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), getTabItemPaneByIndex(wrapper.getIndex())); } } @@ -57,11 +57,8 @@ public class BackgroundTabPane extends BackgroundPane { if (quickPane == null) { BackgroundUIWrapper uiWrapper = getBackgroundUIWrapper(background); quickPane = BackgroundFactory.createByWrapper(uiWrapper); - quickPane.addChangeListener(backgroundChangeListener); cacheMap.put(index, quickPane); } - tabbedPane.setComponentAt(index, quickPane); - tabbedPane.setSelectedIndex(index); return quickPane; } @@ -69,9 +66,7 @@ public class BackgroundTabPane extends BackgroundPane { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { quickPane = createDetailPaneByIndex(index); - tabbedPane.setComponentAt(index, quickPane); cacheMap.put(index, quickPane); - quickPane.addChangeListener(backgroundChangeListener); } return quickPane; } diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/AbstractComponentPopBox.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/AbstractComponentPopBox.java index ef647f2bde..2adfc85ef7 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/AbstractComponentPopBox.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/AbstractComponentPopBox.java @@ -4,14 +4,11 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.background.BackgroundJComponent; import com.fr.general.Background; -import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JWindow; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.util.ArrayList; -import java.util.List; import java.awt.AWTEvent; import java.awt.Dimension; import java.awt.Point; @@ -21,13 +18,17 @@ import java.awt.Window; import java.awt.event.AWTEventListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; /** + * 渐变色弹出窗口 + * * @author Bjorn - * @version 10.0 - * Created by Bjorn on 2021-08-24 + * @since 10.0 + * Created on 2021-08-24 */ -public abstract class AbstractComponentPopBox extends JComponent { +public abstract class AbstractComponentPopBox extends JPanel { protected BackgroundJComponent displayComponent; diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/FixedGradientBar.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/FixedGradientBar.java index 06a217f230..0cb8fd8d47 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/FixedGradientBar.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/FixedGradientBar.java @@ -12,6 +12,7 @@ public class FixedGradientBar extends GradientBar { public FixedGradientBar(int minvalue, int maxvalue) { super(minvalue, maxvalue); + setDraggable(false); } @Override @@ -19,9 +20,4 @@ public class FixedGradientBar extends GradientBar { setColor(getList().get(select).getColorInner()); super.clickButton(select); } - - @Override - protected void addMouseDragListener() { - //不添加拖拽事件 - } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java index 1cbf543a4b..ffd5588b8b 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java @@ -1,5 +1,7 @@ package com.fr.design.style.background.gradient; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.background.GradientBackground; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; @@ -9,17 +11,20 @@ import com.fr.design.utils.gui.UIComponentUtils; import com.fr.design.widget.FRWidgetFactory; import com.fr.general.Background; -import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.JPanel; -import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.BorderLayout; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 渐变色的面板，不是很pp，面板应用显得繁琐，有写可以写成控件类型，比如色彩选择的。。，可以做得花哨点 * @author ben @@ -33,45 +38,44 @@ public class GradientBackgroundPane extends BackgroundDetailPane { private ChangeListener changeListener = null; public GradientBackgroundPane() { - - // bug 5452 简化GradientPane - JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color")); - jpanel.setPreferredSize(new Dimension(450, 320)); - jpanel.setLayout(new BorderLayout()); - // neil:增加渐变色拖动条 - JPanel gradientPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - JPanel blankJp = new JPanel(); gradientBar = new GradientBar(4, DEFAULT_GRADIENT_WIDTH); - blankJp.add(gradientBar); - UILabel jl = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Drag_To_Select_Gradient")); - jl.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20)); - jl.setHorizontalAlignment(SwingConstants.CENTER); - gradientPanel.add(jl, BorderLayout.NORTH); - gradientPanel.add(blankJp, BorderLayout.SOUTH); - jpanel.add(gradientPanel, BorderLayout.NORTH); - - JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - JPanel innercenterPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - centerPane.add(new UILabel(" ")); - centerPane.add(innercenterPane); - innercenterPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction") + ":")); left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Horizontal")); - innercenterPane.add(left2right); left2right.setSelected(true); left2right.addActionListener(reviewListener); top2bottom = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Vertical")); - innercenterPane.add(top2bottom); top2bottom.addActionListener(reviewListener); ButtonGroup toggle = new ButtonGroup(); toggle.add(left2right); toggle.add(top2bottom); - jpanel.add(centerPane, BorderLayout.CENTER); - this.add(jpanel); + JPanel jpanel = column( + 10, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Drag_To_Select_Gradient"))), + flex() + ), + row( + cell(gradientBar), + flex() + ), + fix(10), + row( + 5, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction") + ":")), + fix(20), + cell(left2right), + cell(top2bottom), + flex() + + ) + ).getComponent(); + + this.setLayout(new BorderLayout()); + this.add(FineUIUtils.wrapComponentWithTitle(jpanel, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color"))); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java index 97a19f4643..7954387448 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java @@ -1,5 +1,6 @@ package com.fr.design.style.background.gradient; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.background.ColorBackground; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; @@ -8,34 +9,35 @@ import com.fr.design.style.color.ColorCell; import com.fr.design.style.color.ColorSelectable; import com.fr.design.style.color.NewColorSelectPane; import com.fr.stable.AssistUtils; -import com.fr.stable.os.OperatingSystem; import javax.swing.JPanel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import java.awt.Color; -import java.awt.Cursor; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.LinearGradientPaint; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.List; /** - * TODO:面板缩放的功能没有考虑（就是尾值过大，导致超过界面显示的情况），原来的那个实现完全是个BUG。要缩放的情况也比较少，就干脆以后弄吧 + * 渐变色滑块 + * + * @since 11.0 + * Create on 2023/12/27. */ public class GradientBar extends AbstractComponentPopBox implements UIObserver, ColorSelectable { + private static final String UI_CLASS_ID = "GradientBarUI"; + + @Override + public String getUIClassID() { + return UI_CLASS_ID; + } + private NewColorSelectPane colorPane; - /** - * - */ + + private static final long serialVersionUID = -8503629815871053585L; private List list = new ArrayList(); @@ -57,6 +59,8 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, private static final int MAX_VERTICAL = 45; + private boolean draggable = true; + // 选中的颜色 private Color color; @@ -71,18 +75,15 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, endLabel = new UINumberField(11); endLabel.setValue(max); endLabel.getDocument().addDocumentListener(docListener); - - this.setPreferredSize(new Dimension(max + 5, 50)); - - p1 = new SelectColorPointBtn(startLabel.getValue(), 30, Color.WHITE); - p2 = new SelectColorPointBtn(endLabel.getValue(), 30, Color.BLACK); + int recHeight = FineUIUtils.getAndScaleInt("GradientBar.recHeight", 30); + p1 = new SelectColorPointBtn(startLabel.getValue(), recHeight, Color.WHITE); + p2 = new SelectColorPointBtn(endLabel.getValue(), recHeight, Color.BLACK); list.add(p1); list.add(p2); - this.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - + p1.setStartPosition(0); + p2.setStartPosition(1); addMouseClickListener(); - addMouseDragListener(); iniListener(); } @@ -110,7 +111,7 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, protected void addMouseClickListener() { this.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { - if (e.getX() < max + MOUSE_OFFSET && e.getX() > 0) { + if (e.getX() < getWidth() && e.getX() > 0) { int select = -1; for (int i = 0; i < list.size(); i++) { if (list.get(i).contains(e.getX(), e.getY())) { @@ -159,35 +160,6 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, return colorPane; } - protected void addMouseDragListener() { - this.addMouseMotionListener(new MouseAdapter() { - public void mouseDragged(MouseEvent e) { - int oldIndex = index; - for (int i = 0; i < list.size(); i++) { - if (list.get(i).contains(e.getX(), e.getY())) { - index = i; - break; - } - } - if (OperatingSystem.isLinux() && AssistUtils.equals(oldIndex, index)) { - if (Math.abs(p1.getX() - e.getX()) > Math.abs(p2.getX() - e.getX())) { - index = 1; - } else { - index = 0; - } - } - boolean x = e.getX() <= max && e.getX() >= min; - if (x && e.getY() < MAX_VERTICAL) { - list.get(index).setX(e.getX()); - } - - GradientBar.this.repaint(); - startLabel.setText(Double.toString(p1.getX())); - endLabel.setText(Double.toString(p2.getX())); - } - }); - } - private void iniListener() { uiObserverListener = new ArrayList<>(); if (shouldResponseChangeListener()) { @@ -216,40 +188,6 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, } }; - @Override - protected void paintComponent(Graphics g) { - Graphics2D g2 = (Graphics2D) g; - - Point2D start = new Point2D.Float(4, 0); - Point2D end = new Point2D.Float(max, 0); - Collections.sort(list); - Color[] c = new Color[list.size()]; - for (int i = 0; i < list.size(); i++) { - c[i] = list.get(i).getColorInner(); - } - float[] dist = new float[list.size()]; - for (int i = 0; i < list.size(); i++) { - double value = list.get(i).getX() - 4; - double defaultMax = max - 4; - if (Double.compare(value, defaultMax) > 0) { - // 设置了预定义的渐变色 渐变色起始位置比较大 然后由预定义样式切换到自定义样式 做下等比例转换 - dist[i] = (float) (value / (GradientBackgroundPane.DEFAULT_GRADIENT_WIDTH - 4)); - list.get(i).setX(max * dist[i]); - } else { - dist[i] = (float) (value / defaultMax); - } - } - LinearGradientPaint paint = new LinearGradientPaint(start, end, dist, c); - - g2.setPaint(paint); - g2.fillRect(4, 0, max - 4, 30); - g2.setColor(new Color(138, 138, 138)); - g2.drawRect(4, 0, max - 4, 30); - for (int i = 0; i < list.size(); i++) { - list.get(i).paint(g2); - } - } - /** * 状态改变 */ @@ -281,14 +219,14 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, * @return */ public double getStartValue() { - return startLabel.getValue(); + return p1.getStartPosition() * (max - min) + min; } /** * @return */ public double getEndValue() { - return endLabel.getValue(); + return p2.getStartPosition() * (max - min) + min; } /** @@ -296,7 +234,7 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, */ public void setStartValue(double startValue) { startLabel.setValue(startValue); - p1.setX(startValue); + p1.setStartPosition((startValue - min) / (max - min)); } /** @@ -304,7 +242,7 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, */ public void setEndValue(double endValue) { endLabel.setValue(endValue); - p2.setX(endValue); + p2.setStartPosition((endValue - min) / (max - min)); } /** @@ -359,4 +297,12 @@ public class GradientBar extends AbstractComponentPopBox implements UIObserver, public void colorSetted(ColorCell colorCell) { } + + public boolean isDraggable() { + return draggable; + } + + public void setDraggable(boolean draggable) { + this.draggable = draggable; + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/SelectColorPointBtn.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/SelectColorPointBtn.java index 0d07a96acd..47b925e073 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/SelectColorPointBtn.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/SelectColorPointBtn.java @@ -4,6 +4,7 @@ import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.geom.GeneralPath; +import java.awt.geom.Path2D; public class SelectColorPointBtn implements Comparable { @@ -11,12 +12,19 @@ public class SelectColorPointBtn implements Comparable { private double y; private double a = 4; private double b = 4; - private GeneralPath ipath; - private GeneralPath jpath; + private Path2D ipath; + private Path2D jpath; private Color colorInner; + // 起始位置，范围（0，1） + private double startPosition; + private double max; + /*提供一个可设置拖拉按钮边框颜色*/ private Color borderColor; + private boolean hover = false; + private boolean pressed = false; + public SelectColorPointBtn(double m, double n, Color colorInner){ this(m, n, colorInner, Color.BLACK); } @@ -40,6 +48,14 @@ public class SelectColorPointBtn implements Comparable { this.x = x; } + public double getStartPosition() { + return startPosition; + } + + public void setStartPosition(double startPosition) { + this.startPosition = startPosition; + } + public double getY() { return y; } @@ -84,6 +100,13 @@ public class SelectColorPointBtn implements Comparable { g2.setColor(new Color(228, 228, 228)); g2.draw(jpath); } + + /** + * 更新拖拉按钮路径 + */ + public void updatePath(Path2D directionalThumbShape) { + this.ipath = directionalThumbShape; + } public boolean contains(double x, double y){ return ipath.contains(x, y); @@ -93,4 +116,20 @@ public class SelectColorPointBtn implements Comparable { public int compareTo(SelectColorPointBtn o) { return Double.compare(x, o.x); } + + public boolean isHover() { + return hover; + } + + public void setHover(boolean b) { + hover = b; + } + + public boolean isPressed() { + return pressed; + } + + public void setPressed(boolean pressed) { + this.pressed = pressed; + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/BPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/BPane.java index 8f91686764..f939db88be 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/BPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/BPane.java @@ -1,5 +1,6 @@ package com.fr.design.style.background.impl; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.background.BackgroundDetailPane; @@ -17,21 +18,13 @@ public abstract class BPane extends BackgroundDetailPane { protected void initComponents(int nColumn) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); - - JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); - this.add(contentPane, BorderLayout.NORTH); -// contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS)); - - // type type. - - JPanel typePane = FRGUIPaneFactory.createTitledBorderPane(titleOfTypePane()); - contentPane.add(typePane); JPanel typePane2 = new JPanel(); - typePane.add(typePane2); typePane2.setLayout(layoutOfTypePane(nColumn)); setChildrenOfTypePane(typePane2); + JPanel contentPane = (JPanel) FineUIUtils.wrapComponentWithTitle(typePane2, titleOfTypePane()); + this.add(contentPane, BorderLayout.NORTH); + setChildrenOfContentPane(contentPane); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java index 3eb990c318..52bb9b3a7f 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java @@ -1,5 +1,8 @@ package com.fr.design.style.background.impl; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.base.Style; import com.fr.base.background.ImageBackground; import com.fr.base.background.ImageFileBackground; @@ -19,14 +22,20 @@ import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.UIManager; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; import java.awt.GridLayout; import java.awt.Image; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; + /** * Image background pane. */ @@ -47,36 +56,36 @@ public class ImageBackgroundPane extends BackgroundDetailPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); // preview pane - JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - this.add(previewContainerPane, BorderLayout.CENTER); - - JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); - previewOwnerPane.setLayout(new BorderLayout()); - previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); - previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST); previewPane = new ImagePreviewPane(); - previewOwnerPane.add(new JScrollPane(previewPane)); previewPane.addChangeListener(imageSizeChangeListener); - + previewPane.setOpaque(false); // init image file chooser. imageFileChooser = new ImageFileChooser(); imageFileChooser.setMultiSelectionEnabled(false); + + + this.add(column( + 5, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))).with(it -> FineUIStyle.setStyle(it, FineUIStyle.LABEL_TIP)), + row( + 10, + cell(new JScrollPane(previewPane)).with(it -> { + it.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + it.getViewport().setOpaque(false); + it.setBorder(new FineRoundBorder()); + }).weight(1), + cell(initSelectFilePane()) + ).weight(1) + ).getComponent()); } public JPanel initSelectFilePane() { - JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - - selectFilePane.setBorder(BorderFactory.createEmptyBorder(8, 2, 4, 0)); UIButton selectPictureButton = new UIButton( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Select")); - selectFilePane.add(selectPictureButton, BorderLayout.NORTH); selectPictureButton.setMnemonic('S'); selectPictureButton.addActionListener(selectPictureActionListener); - JPanel layoutPane = FRGUIPaneFactory.createMediumHGapHighTopFlowInnerContainer_M_Pane(); - selectFilePane.add(layoutPane, BorderLayout.CENTER); - //布局 defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default")); tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled")); @@ -88,20 +97,17 @@ public class ImageBackgroundPane extends BackgroundDetailPane { extendRadioButton.addActionListener(layoutActionListener); adjustRadioButton.addActionListener(layoutActionListener); - JPanel jp = new JPanel(new GridLayout(4, 1, 15, 15)); + JPanel jp = new JPanel(new GridLayout(4, 1, 10, 10)); for (UIRadioButton button : imageLayoutButtons()) { jp.add(button); } - layoutPane.add(jp); - ButtonGroup layoutBG = new ButtonGroup(); layoutBG.add(defaultRadioButton); layoutBG.add(tiledRadioButton); layoutBG.add(extendRadioButton); layoutBG.add(adjustRadioButton); - defaultRadioButton.setSelected(true); - return selectFilePane; + return column(10, cell(selectPictureButton), cell(jp)).getComponent(); } protected UIRadioButton[] imageLayoutButtons() { diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java index f29ece0c01..976744e3b3 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java @@ -1,28 +1,52 @@ package com.fr.design.style.background.impl; +import com.fine.theme.utils.FineUIScale; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.background.BackgroundDetailPane; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Background; +import com.fr.general.locale.image.I18nImage; import javax.swing.*; import javax.swing.event.ChangeListener; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Image; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; + /** * Null background pane. */ public class NullBackgroundPane extends BackgroundDetailPane { + private static final String NULL_BACKGROUND = "/com/fr/design/images/background/null_background.png"; + private static final Image DEFAULT_NULL_BACKGROUND_IMAGE; + + static { + DEFAULT_NULL_BACKGROUND_IMAGE = I18nImage.getImage(NULL_BACKGROUND); + } + public NullBackgroundPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); UILabel centerLabel = new UILabel( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Background_Is_Null") + "..."); - this.add(centerLabel); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Background_Is_Null")); + ImagePanel imagePane = new ImagePanel(); + JPanel pane = column( + 10, + flex(), + cell(imagePane), + cell(centerLabel), + flex() + ).getComponent(); centerLabel.setHorizontalAlignment(SwingConstants.CENTER); - centerLabel.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); + add(pane, BorderLayout.CENTER); } public void populate(Background background) { @@ -36,4 +60,30 @@ public class NullBackgroundPane extends BackgroundDetailPane { public void addChangeListener(ChangeListener changeListener) { // do nothing. } + + /** + * 水平居中绘制 Image + */ + public class ImagePanel extends JPanel { + + public ImagePanel() { + } + + @Override + public void paintComponent(Graphics g) { + super.paintComponent(g); + if (DEFAULT_NULL_BACKGROUND_IMAGE != null) { + int x = (this.getWidth() - DEFAULT_NULL_BACKGROUND_IMAGE.getWidth(null)) / 2; + g.drawImage(DEFAULT_NULL_BACKGROUND_IMAGE, x, 0, this); + } + } + + @Override + public Dimension getPreferredSize() { + if (DEFAULT_NULL_BACKGROUND_IMAGE == null) { + return super.getPreferredSize(); + } + return FineUIScale.scale(new Dimension(DEFAULT_NULL_BACKGROUND_IMAGE.getWidth(null), DEFAULT_NULL_BACKGROUND_IMAGE.getHeight(null))); + } + } } diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java index 886076ca08..0671c49aa5 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java @@ -1,5 +1,7 @@ package com.fr.design.style.background.impl; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.GraphHelper; import com.fr.base.background.PatternBackground; import com.fr.design.gui.ilable.UILabel; @@ -16,6 +18,11 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.geom.Rectangle2D; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * Pattern background pane. */ @@ -63,31 +70,27 @@ public class PatternBackgroundPane extends BPane { protected void setChildrenOfContentPane(JPanel contentPane) { // colors - JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors")); - contentPane.add(colorPane); - foregroundColorPane = new ColorSelectBox(80); + foregroundColorPane.setPreferredSize(FineUIScale.scale(new Dimension(80, 24))); backgroundColorPane = new ColorSelectBox(80); + backgroundColorPane.setPreferredSize(FineUIScale.scale(new Dimension(80, 24))); foregroundColorPane.setSelectObject(Color.lightGray); backgroundColorPane.setSelectObject(Color.black); - - colorPane.add(Box.createHorizontalStrut(2)); - colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") - + ":", foregroundColorPane)); - - colorPane.add(Box.createHorizontalStrut(8)); - - colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") - + ":", backgroundColorPane)); - } - - private JPanel createLabelColorPane(String text, - ColorSelectBox colorPane) { - JPanel labelColorPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - labelColorPane.add(new UILabel(text)); - labelColorPane.add(colorPane); - - return labelColorPane; + contentPane.add(FineUIUtils.wrapComponentWithTitle(column( + 10, + row( + 60, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":")).weight(0.1), + cell(foregroundColorPane).weight(0.45), + flex() + ), + row( + 60, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":")).weight(0.1), + cell(backgroundColorPane).weight(0.45), + flex() + ) + ).getComponent(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors"))); } public void populate(Background background) { diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorAdjustPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorAdjustPane.java index f5ff739fa6..4036a078ed 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorAdjustPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorAdjustPane.java @@ -1,5 +1,6 @@ package com.fr.design.style.color; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.chart.base.ChartConstants; import com.fr.design.DesignerEnvManager; @@ -13,6 +14,7 @@ import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; @@ -36,7 +38,7 @@ public class ColorAdjustPane extends JPanel implements UIObserver { public static final Color[] DEFAULT_COLORS = ChartConstants.NEW_FEATURES; - private static final int COUNT_OF_ROW = 8; + private static final int COUNT_OF_ROW = 12; private static final int MAX_BUTTON = 40; @@ -84,7 +86,7 @@ public class ColorAdjustPane extends JPanel implements UIObserver { this.setLayout(layout); for (int i = 0, size = colorButtons.size(); i < size; i += COUNT_OF_ROW) { - JPanel panel = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); + JPanel panel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(2, 2); int count = i + COUNT_OF_ROW > colorButtons.size() ? colorButtons.size() : i + COUNT_OF_ROW; for (int j = i; j < count; j++) { colorButtons.get(j).setLastButton(false); @@ -124,6 +126,7 @@ public class ColorAdjustPane extends JPanel implements UIObserver { }; colorButton.addChangeListener(changeListener); + colorButton.setBorder(new ScaledEmptyBorder(0, 0, 0, 1)); return colorButton; } diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorCell.java b/designer-base/src/main/java/com/fr/design/style/color/ColorCell.java index acc26ca5aa..3fa1293c13 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorCell.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorCell.java @@ -10,6 +10,7 @@ import java.awt.event.MouseEvent; import javax.swing.JComponent; +import com.fine.theme.utils.FineUIScale; import com.fr.design.DesignerEnvManager; import com.fr.design.constants.UIConstants; import com.fr.general.ComparatorUtils; @@ -25,9 +26,6 @@ public class ColorCell extends JComponent implements ColorSelectable { */ public ColorCell() { enableEvents(AWTEvent.MOUSE_EVENT_MASK); - setPreferredSize(new Dimension(16, 16)); -// setBorder(new LineBorder(Color.gray)); - this.setCursor(new Cursor(Cursor.HAND_CURSOR)); } @@ -122,9 +120,15 @@ public class ColorCell extends JComponent implements ColorSelectable { return getPreferredSize(); } + @Override + public Dimension getPreferredSize() { + int cellSize = FineUIScale.scale(16); + return new Dimension(cellSize, cellSize); + } + /** * 选中颜色 - * @param 颜色单元格 + * @param colorCell * */ @Override diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java b/designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java index 45e2a2b948..100feb2d35 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java @@ -4,6 +4,7 @@ import javax.swing.*; import java.awt.*; +import com.fine.theme.utils.FineUIScale; import sun.swing.SwingUtilities2; /** @@ -11,17 +12,17 @@ import sun.swing.SwingUtilities2; */ public class ColorChooserPreview extends JPanel { - private static final int SQUARE_SIZE = 25; - private static final int SQUARE_GAP = 5; + private static final int SQUARE_SIZE = FineUIScale.scale(25); + private static final int SQUARE_GAP = FineUIScale.scale(5); /** * 方形预览框，三层嵌套框之间的间隔 */ - private static final int INNER_GAP = 5; + private static final int INNER_GAP = FineUIScale.scale(5); private static final int INNER_GAP2 = (INNER_GAP * 2); private static final int INNER_GAP3 = (INNER_GAP * 4); - private static final int TEXT_GAP = 5; + private static final int TEXT_GAP = FineUIScale.scale(5); private static final int PREFERSIZE_TEXT_GAP = (TEXT_GAP * 3); private static final int PREFERSIZE_SQUARE_GAP = (SQUARE_GAP * 2); diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java b/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java index b84173f1db..a112c00768 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorControlWindow.java @@ -9,6 +9,9 @@ import javax.swing.event.ChangeListener; import java.awt.BorderLayout; import java.awt.Color; +import static com.fine.theme.utils.FineUIStyle.POPUP_MENU_DROPDOWN; +import static com.fine.theme.utils.FineUIStyle.setStyle; + public abstract class ColorControlWindow extends JPopupMenu { private static final long serialVersionUID = 4317136753151221742L; private PopupHider popupHider; @@ -29,6 +32,7 @@ public abstract class ColorControlWindow extends JPopupMenu { public ColorControlWindow(boolean isSupportTransparent, PopupHider popupHider) { this.initComponents(isSupportTransparent); this.popupHider = popupHider; + setStyle(this, POPUP_MENU_DROPDOWN); } public Color getColor() { @@ -52,11 +56,9 @@ public abstract class ColorControlWindow extends JPopupMenu { private void initComponents(boolean isSupportTransparent) { setLightWeightPopupEnabled(JPopupMenu.getDefaultLightWeightPopupEnabled()); - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - setBorderPainted(false); - setOpaque(false); - setDoubleBuffered(true); + // windows下 需要手动处理焦点，不去抢占焦点，防止菜单栏弹窗消失 setFocusable(false); + this.setLayout(FRGUIPaneFactory.createBorderLayout()); initSelectionPopupPane(isSupportTransparent); this.pack(); } diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java index 3756fc627e..0f6631073d 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java @@ -1,6 +1,13 @@ package com.fr.design.style.color; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.frpane.FineTabbedPane; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; @@ -11,6 +18,10 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; import static com.fr.design.i18n.Toolkit.i18nText; /** @@ -26,9 +37,6 @@ public class ColorSelectDetailPane extends BasicPane { // 颜色选择器面板 private JColorChooser selectedPanel; - // 最近使用颜色面板 - private JPanel recentUsePanel; - // 预览 private JPanel previewPanel; @@ -70,26 +78,18 @@ public class ColorSelectDetailPane extends BasicPane { // 颜色选择器面板 selectedPanel = new JColorChooser(this.color); - selectedPanel.setPreferredSize(new Dimension(selectedPanel.getWidth(), SELECT_PANEL_HEIGHT)); + selectedPanel.setPreferredSize(new Dimension(selectedPanel.getWidth(), FineUIScale.scale(SELECT_PANEL_HEIGHT))); selectedPanel.setPreviewPanel(new JPanel()); swatchChooserPanel = new SwatchChooserPanel(); customChooserPanel = new CustomChooserPanel(); selectedPanel.setChooserPanels(new AbstractColorChooserPanel[]{customChooserPanel, swatchChooserPanel}); - this.add(selectedPanel, BorderLayout.NORTH); - - // 最近使用面板 - recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Used")); - RecentUseColorPane recent = new RecentUseColorPane(selectedPanel); - recentUsePanel.add(recent); - - this.add(recentUsePanel, BorderLayout.CENTER); - selectedPanel.setPreviewPanel(new JPanel()); // 预览 - previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(i18nText("Fine-Design_Basic_Preview")); + previewPanel = new JPanel(new BorderLayout()); final ColorChooserPreview colorChooserPreview = new ColorChooserPreview(); + colorChooserPreview.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); ColorSelectionModel model = selectedPanel.getSelectionModel(); model.addChangeListener(new ChangeListener() { @Override @@ -99,8 +99,44 @@ public class ColorSelectDetailPane extends BasicPane { colorChooserPreview.repaint(); } }); - previewPanel.add(colorChooserPreview); - this.add(previewPanel, BorderLayout.SOUTH); + previewPanel.add(row( + flex(), + column(flex(), cell(colorChooserPreview), flex()), + flex() + ).getComponent()); + JPanel center = initCenterPane(); + center.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); + add(center); + } + + private FineTabbedPane buildTabbedPane() { + return FineTabbedPane.builder().withHeadRatio(0.3f) + .addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"), customChooserPanel) + .addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Swatch"), swatchChooserPanel).build(); + } + + private JPanel initCenterPane() { + // 最近使用面板 + RecentUseColorPane recent = new RecentUseColorPane(selectedPanel); + UILabel label = new UILabel( i18nText("Fine-Design_Basic_Used")); + FineUIUtils.wrapBoldLabelWithUnderline(label); + + FineTabbedPane tabbedPane = buildTabbedPane(); + return column( + cell(tabbedPane), + column( + 10, + cell(label), cell(recent), + column( + 2, + cell(new UILabel(i18nText("Fine-Design_Basic_Preview"))), + cell(previewPanel).with(it -> { + it.setBorder(new FineRoundBorder()); + it.setPreferredSize(new Dimension(this.getPreferredSize().width, FineUIScale.scale(120))); + it.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + }) + )).with(it -> it.setBorder(new ScaledEmptyBorder(0, 10, 0, 10))) + ).getComponent(); } public void populate(Color color){ diff --git a/designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java b/designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java index 49a3a91254..48f5e5f2bf 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java +++ b/designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java @@ -11,6 +11,7 @@ import javax.swing.ButtonGroup; import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JColorChooser; +import javax.swing.JLayeredPane; import javax.swing.JPanel; import javax.swing.SpinnerNumberModel; import javax.swing.SwingConstants; @@ -22,7 +23,9 @@ import javax.swing.event.DocumentListener; import javax.swing.text.BadLocationException; import javax.swing.text.Document; -import com.fr.design.gui.ibutton.SpecialUIButton; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.islider.UISlider; @@ -30,6 +33,12 @@ import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.gui.itextfield.UITextField; import com.fr.log.FineLoggerFactory; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 颜色选择器自定义面板 @@ -115,17 +124,17 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec /** * The default width of the gradient image. */ - private static final int IMG_WIDTH = 200; + private static final int IMG_WIDTH = 180; /** * The default height of the gradient image. */ - private static final int IMG_HEIGHT = 205; + private static final int IMG_HEIGHT = 180; /** * The default width of the track gradient. */ - private static final int TRACK_WIDTH = 20; + private static final int TRACK_WIDTH = 12; /** * The UILabel for Red. @@ -157,6 +166,9 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec private static final int TWENTY_FOUR = 24; private static final int HEX_FF = 0xff; + private static final int BUTTON_SPINNER_GAP = 5; + private static final int HSB_GAP = 10; + // 占位label private static final UILabel PLACE_HOLDER_LABEL = new UILabel(); @@ -584,10 +596,11 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec * This method builds the DefaultHSBChooserPanel. */ protected void buildChooser() { - setLayout(new BorderLayout()); - add(buildRightPanel(), BorderLayout.EAST); + setLayout(new BorderLayout(10, 0)); + setPreferredSize(new Dimension((int) this.getPreferredSize().getWidth(), FineUIScale.scale(180))); + add(buildRightPanel(), BorderLayout.CENTER); JPanel container = new JPanel(); - container.setLayout(new BorderLayout()); + container.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 0)); gradientPanel = createGradientPanel(); MouseAdapter ml = new MainGradientMouseListener(); @@ -603,10 +616,16 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec slider.setOrientation(SwingConstants.VERTICAL); updateSlider(); + JLayeredPane layeredPane = new JLayeredPane(); + layeredPane.add(trackPanel, JLayeredPane.DEFAULT_LAYER); + layeredPane.add(slider, JLayeredPane.PALETTE_LAYER); - container.add(gradientPanel, BorderLayout.WEST); - container.add(slider, BorderLayout.CENTER); - container.add(trackPanel, BorderLayout.EAST); + container.add(gradientPanel); + container.add(layeredPane); + + layeredPane.setPreferredSize(FineUIScale.scale(new Dimension(12, 180))); + slider.setSize(FineUIScale.scale(new Dimension(12, 180))); + trackPanel.setSize(FineUIScale.scale(new Dimension(12, 180))); add(container, BorderLayout.WEST); slider.addChangeListener(new SliderChangeListener()); @@ -619,7 +638,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec private JPanel createGradientPanel() { return new JPanel() { public Dimension getPreferredSize() { - return new Dimension(IMG_WIDTH, IMG_HEIGHT); + return FineUIScale.scale(new Dimension(IMG_WIDTH, IMG_HEIGHT)); } public void paint(Graphics g) { @@ -638,7 +657,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec private JPanel createTrackPanel() { return new JPanel() { public Dimension getPreferredSize() { - return new Dimension(TRACK_WIDTH, IMG_HEIGHT); + return FineUIScale.scale(new Dimension(TRACK_WIDTH, IMG_HEIGHT)); } public void paint(Graphics g) { @@ -680,47 +699,50 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec * @return The right side panel. */ private Container buildRightPanel() { - JPanel container = new JPanel(); - container.setLayout(new FlowLayout(FlowLayout.RIGHT)); - - // 主面板 - JPanel mainPanel = new JPanel(); - mainPanel.setLayout(new BorderLayout(0, 10)); - UILabel label = new UILabel(); - label.setSize(200, 200); - container.add(label); - container.add(mainPanel); - - // hsb和rgb面板 - JPanel hsbAndRgbPanel = new JPanel(); - hsbAndRgbPanel.setLayout(new BorderLayout(0, 16)); - hsbAndRgbPanel.add(initialHSBPanel(), BorderLayout.CENTER); - hsbAndRgbPanel.add(initialRGBPanel(), BorderLayout.SOUTH); - - // 十六进制面板 - JPanel hexPanel = new JPanel(); - hexPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 8, 0)); - hexPanel.add(new UILabel("#")); - hexPanel.add(field); - - mainPanel.add(hsbAndRgbPanel, BorderLayout.CENTER); - mainPanel.add(hexPanel, BorderLayout.SOUTH); - - JPanel rightPane = new JPanel(new BorderLayout()); - JButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON18, true); - JPanel blankArea = new JPanel(); - blankArea.setPreferredSize(new Dimension(100, 175)); - rightPane.add(blankArea, BorderLayout.CENTER); - JPanel buttonPane = new JPanel(new BorderLayout()); - buttonPane.add(pickColorButton, BorderLayout.WEST); - rightPane.add(buttonPane, BorderLayout.SOUTH); - container.add(rightPane); + + JPanel container = new JPanel(new BorderLayout()); + JButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON24, true); + JPanel pane = new JPanel(new BorderLayout()); + pane.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + pane.add(pickColorButton); + pane.setBorder(new FineRoundBorder()); + container.add(column( + 10, + row( + 10, + cell(initialHSBPanel()), + cell(initialRGBPanel()), + flex() + ), + row( + BUTTON_SPINNER_GAP, + row(fix((int) hRadio.getPreferredSize().getHeight()), cell(new UILabel("#")), flex()).with(it -> it.setPreferredSize(hRadio.getPreferredSize())), + cell(field), + cell(pane).with(it -> it.setPreferredSize(new Dimension((int) pickColorButton.getPreferredSize().getWidth(), (int) pickColorButton.getPreferredSize().getHeight()))) + ) + ).getComponent()); return container; } //初始化HSB部分 private JPanel initialHSBPanel() { + initButtonGroup(); + initSpinner(); + MouseAdapter cl = new RadioStateListener(); + locked = HLOCKED; + hRadio.setSelected(true); + hRadio.addMouseListener(cl); + sRadio.addMouseListener(cl); + bRadio.addMouseListener(cl); + + return column(HSB_GAP, row(BUTTON_SPINNER_GAP, cell(hRadio), cell(hSpinner)), + row(BUTTON_SPINNER_GAP, cell(sRadio), cell(sSpinner)), + row(BUTTON_SPINNER_GAP, cell(bRadio), cell(bSpinner)) + ).getComponent(); + } + + private void initButtonGroup() { hRadio = new UIRadioButton("H"); sRadio = new UIRadioButton("S"); bRadio = new UIRadioButton("B"); @@ -728,54 +750,37 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec group.add(hRadio); group.add(sRadio); group.add(bRadio); + } + private void initSpinner() { hSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, 359, 1)); + setBackground(hSpinner); sSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, 100, 1)); + setBackground(sSpinner); bSpinner = new UIBasicSpinner(new SpinnerNumberModel(100, 0, 100, 1)); + setBackground(bSpinner); hSpinner.setEnabled(true); sSpinner.setEnabled(false); bSpinner.setEnabled(false); - MouseAdapter cl = new RadioStateListener(); - locked = HLOCKED; - hRadio.setSelected(true); - hRadio.addMouseListener(cl); - sRadio.addMouseListener(cl); - bRadio.addMouseListener(cl); - ChangeListener scroll = new ImageScrollListener(); hSpinner.addChangeListener(scroll); sSpinner.addChangeListener(scroll); bSpinner.addChangeListener(scroll); + } - JPanel hsbPanel = new JPanel(); - hsbPanel.setLayout(new GridLayout(3, 0, 0, 5)); - - JPanel hPanel = new JPanel(); - hPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 0)); - hPanel.add(hRadio); - hPanel.add(hSpinner); - hsbPanel.add(hPanel); - - JPanel sPanel = new JPanel(); - sPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 0)); - sPanel.add(sRadio); - sPanel.add(sSpinner); - hsbPanel.add(sPanel); - - JPanel lPanel = new JPanel(); - lPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 0)); - lPanel.add(bRadio); - lPanel.add(bSpinner); - hsbPanel.add(lPanel); - return hsbPanel; + private void setBackground(Component component) { + component.setBackground(Color.WHITE); } private JPanel initialRGBPanel() { // 初始化RGB部分 rSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, 255, 1)); + setBackground(rSpinner); gSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, 255, 1)); + setBackground(gSpinner); bbSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, 255, 1)); + setBackground(bbSpinner); rSpinner.setEnabled(true); gSpinner.setEnabled(true); @@ -785,31 +790,15 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec TextDocumentListener listen = new TextDocumentListener(); field = new UITextField(); - field.setPreferredSize(new Dimension(70, 18)); + field.setPreferredSize(new Dimension(hSpinner.getPreferredSize())); field.getDocument().addDocumentListener(listen); - JPanel rgbPanel = new JPanel(); - rgbPanel.setLayout(new GridLayout(3, 0, 0, 5)); - - JPanel rPanel = new JPanel(); - rPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 0)); - rPanel.add(R); - rPanel.add(rSpinner); - rgbPanel.add(rPanel); - - JPanel gPanel = new JPanel(); - gPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 0)); - gPanel.add(G); - gPanel.add(gSpinner); - rgbPanel.add(gPanel); - - JPanel bPanel = new JPanel(); - bPanel.setLayout(new FlowLayout(FlowLayout.RIGHT, 10, 0)); - bPanel.add(B); - bPanel.add(bbSpinner); - rgbPanel.add(bPanel); - - return rgbPanel; + return column( + HSB_GAP, + row(BUTTON_SPINNER_GAP, cell(R), cell(rSpinner)), + row(BUTTON_SPINNER_GAP, cell(G), cell(gSpinner)), + row(BUTTON_SPINNER_GAP, cell(B), cell(bbSpinner)) + ).getComponent(); } /** diff --git a/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java index 5d7e81487e..f11f8a8e35 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java @@ -11,10 +11,14 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.geom.Rectangle2D; -import javax.swing.BorderFactory; -import javax.swing.Box; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.gui.ilable.UILabel; + +import javax.swing.BorderFactory; import javax.swing.JPanel; +import javax.swing.UIManager; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -23,6 +27,10 @@ import com.fr.design.border.UITitledBorder; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; + /** * The detail color select pane. @@ -37,28 +45,13 @@ public class DetailColorSelectPane extends BasicPane { } public DetailColorSelectPane(boolean supportTheme) { - this.setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4)); this.setLayout(FRGUIPaneFactory.createBorderLayout()); - - JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")); - JPanel defaultPane =FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - this.add(titledefaultPane, BorderLayout.WEST); - titledefaultPane.add(defaultPane); - - defaultPane.add(Box.createHorizontalStrut(4)); - JPanel colorSelectContainPane =FRGUIPaneFactory.createBorderLayout_L_Pane(); - defaultPane.add(colorSelectContainPane); colorSelectPane = NewColorSelectPane.createColorSelectPaneWithTheme(supportTheme); - colorSelectContainPane.add(colorSelectPane, BorderLayout.NORTH); - - defaultPane.add(Box.createHorizontalStrut(8)); //color preview JPanel colorPreviewContainPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - defaultPane.add(colorPreviewContainPane); JPanel colorPreviewPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - colorPreviewPane.setPreferredSize(new Dimension(180, 60)); colorPreviewContainPane.add(colorPreviewPane, BorderLayout.NORTH); colorPreviewLabel = new UILabel(" ") { @@ -76,13 +69,26 @@ public class DetailColorSelectPane extends BasicPane { this.getFont().getStyle(), this.getFont().getSize() + 4)); colorPreviewLabel.setBorder(BorderFactory.createEmptyBorder(0, 2, 2, 2)); colorPreviewPane.add(colorPreviewLabel, BorderLayout.CENTER); - UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); - colorPreviewPane.setBorder(explainBorder); this.addChangeListener(colorPreviewLabelChangeListener); //use the white as the default color. this.populate(Color.WHITE); + + JPanel center = column( + 5, + row( + 20, + cell(colorSelectPane.transparentButton).weight(0.3), + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))).weight(0.53).with(it -> FineUIStyle.setStyle(it, FineUIStyle.LABEL_TIP)) + ), + row( + 20, + cell(colorSelectPane.theme).weight(0.3).with(it -> it.setBorder(new FineRoundBorder())), + cell(colorPreviewPane).weight(0.53).with(it -> it.setBorder(new FineRoundBorder())) + ) + ).getComponent(); + this.add(FineUIUtils.wrapComponentWithTitle(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"))); } @Override diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index e9c8b7a7d3..771a07d1d2 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -1,5 +1,9 @@ package com.fr.design.style.color; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.FineColor; import com.fr.base.theme.FineColorDeriveState; import com.fr.base.theme.TemplateTheme; @@ -24,13 +28,15 @@ import javax.swing.event.ChangeListener; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Cursor; -import java.awt.Dimension; import java.awt.GridLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + /** * @author zhou @@ -39,10 +45,7 @@ import java.util.List; public class NewColorSelectPane extends BasicPane implements ColorSelectable { private static final long serialVersionUID = -8634152305687249392L; - private static final int WIDTH = 216; - private static final int HEIGHT = 230; - - private static final int DEFAULT_COLOR_HOR_INTERVAL = 4; + private static final int DEFAULT_COLOR_HOR_INTERVAL = FineUIScale.scale(4); //颜色衍生的数量 private static final int DEFAULT_DERIVE_COUNT = 5; @@ -60,6 +63,12 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { private final JPanel menuColorPane; private ColorCell[][] themeColorCellGrid; + // 透明 + public UIButton transparentButton = new UIButton(); + // 主题 + public JPanel theme = new JPanel(); + + public static NewColorSelectPane createColorSelectPaneWithTheme(boolean supportTheme) { return new NewColorSelectPane(true, supportTheme); } @@ -83,34 +92,37 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { initSelectButton(isSupportTransparent); // center JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); - centerPane.setBorder(BorderFactory.createEmptyBorder(10, 6, 0, 6)); - this.add(centerPane, BorderLayout.CENTER); + centerPane.setOpaque(false); menuColorPane = getMenuColorPane(); if (isSupportThemeColor) { JPanel themePane = initThemeColorPane(); + themePane.setOpaque(false); + themePane.setBorder(new ScaledEmptyBorder(5, 6, 0, 6)); centerPane.add(themePane); } else { + menuColorPane.setBorder(new ScaledEmptyBorder(5, 6, 0, 6)); centerPane.add(menuColorPane); + menuColorPane.setOpaque(false); initMenuColorPane(); } JPanel standardColorPane = new JPanel(new BorderLayout(0, 5)); - standardColorPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + standardColorPane.setBorder(new ScaledEmptyBorder(10, 6, 0, 6)); standardColorPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Standard_Color")), BorderLayout.CENTER); - centerPane.add(standardColorPane); JPanel colorSelectPane = createStandardColorPane(); standardColorPane.add(colorSelectPane, BorderLayout.SOUTH); + standardColorPane.setOpaque(false); // 增加最近使用 pane JPanel row1Pane = new JPanel(new BorderLayout(0, 5)); - row1Pane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + row1Pane.setBorder(new ScaledEmptyBorder(10, 6, 0, 6)); row1Pane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Used")), BorderLayout.CENTER); - centerPane.add(row1Pane); // 最近使用 usedColorPane = new NewUsedColorPane(9, this, selectRealTime()); row1Pane.add(usedColorPane.getPane(), BorderLayout.SOUTH); + row1Pane.setOpaque(false); // mod by anchore 16/11/16 final UIButton customButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_More_Color")); @@ -128,10 +140,26 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { customButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); JPanel centerPane1 = new JPanel(new BorderLayout(0, 0)); - centerPane1.setBorder(BorderFactory.createEmptyBorder(8, 0, 9, 0)); + centerPane1.setBorder(new ScaledEmptyBorder(10, 6, 6, 6)); centerPane1.add(customButton, BorderLayout.CENTER); - customButton.setPreferredSize(new Dimension(197, 20)); - centerPane.add(centerPane1); + centerPane1.setOpaque(false); + + + theme = column( + cell(centerPane), + cell(standardColorPane), + cell(row1Pane), + cell(centerPane1) + ).with(it -> { + it.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + it.setOpaque(true); + + if (!isSupportTransparent) { + it.setBorder(new FineRoundBorder()); + } + }).getComponent(); + + this.add(theme, BorderLayout.CENTER); } private JPanel createStandardColorPane() { @@ -156,6 +184,9 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { JPanel centerPane = new JPanel(new GridLayout(1, 8, DEFAULT_COLOR_HOR_INTERVAL, 0)); menuColorPane.add(northPane, BorderLayout.NORTH); menuColorPane.add(centerPane, BorderLayout.CENTER); + menuColorPane.setOpaque(false); + northPane.setOpaque(false); + centerPane.setOpaque(false); Color[] colorArray = new Color[]{ // 8列主题色 @@ -191,10 +222,11 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { northPane.add(themeColorCellGrid[i][0]); } for (int i = 0; i < colorArray.length; i++) { - JPanel columnPane = new JPanel(new GridLayout(DEFAULT_DERIVE_COUNT - 1, 1, 0, 0)); + JPanel columnPane = new JPanel(new GridLayout(DEFAULT_DERIVE_COUNT - 1, 1, 4, 4)); for (int j = 1; j < DEFAULT_DERIVE_COUNT; j++) { columnPane.add(themeColorCellGrid[i][j]); } + columnPane.setOpaque(false); centerPane.add(columnPane); } @@ -239,7 +271,9 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { Color[] colorArray = this.getColorArray(); for (int i = 0; i < colorArray.length; i++) { Color color = colorArray[i] == null ? UsedColorPane.DEFAULT_COLOR : colorArray[i]; - menuColorPane.add(new ColorCell(color, this)); + ColorCell c = new ColorCell(color, this); + c.setOpaque(false); + menuColorPane.add(c); } } @@ -259,11 +293,15 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { protected void initSelectButton(boolean isSupportTransparent) { this.isSupportTransparent = isSupportTransparent; this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.setBorder(new UIRoundedBorder(UIConstants.TOOLBAR_BORDER_COLOR, 1, 5)); if (isSupportTransparent) { - UIButton transparentButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency")); - this.add(transparentButton, BorderLayout.NORTH); + JPanel transparentJpanel = new JPanel(new BorderLayout(0, 0)); + transparentButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency")); transparentButton.addActionListener(e -> doTransparent()); + transparentButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); + transparentJpanel.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + transparentJpanel.add(transparentButton, BorderLayout.CENTER); + transparentJpanel.setBorder(new ScaledEmptyBorder(6, 6, 6, 6)); + this.add(transparentJpanel, BorderLayout.NORTH); } } @@ -364,18 +402,6 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, color, this); } - @Override - public Dimension getPreferredSize() { - int height = HEIGHT; - if (isSupportTransparent) { - height += 15; - } - if (isSupportThemeColor) { - height += 25; - } - return new Dimension(WIDTH, height); - } - /** * 更新最近使用颜色 */ @@ -411,6 +437,9 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { private void initialComponents() { int total = columns; JPanel panel = new JPanel(); + // 取色按钮 + JButton pickColorButton = PickColorButtonFactory.getPickColorButton(selectable, PickColorButtonFactory.IconType.ICON16, setColorRealTime); + panel.add(pickColorButton); panel.setLayout(new GridLayout(1, columns + 1, DEFAULT_COLOR_HOR_INTERVAL, 0)); panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); //最近使用颜色 @@ -421,9 +450,6 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { UsedColorPane.DEFAULT_COLOR; panel.add(new ColorCell(color == null ? UsedColorPane.DEFAULT_COLOR : color, selectable)); } - // 取色按钮 - JButton pickColorButton = PickColorButtonFactory.getPickColorButton(selectable, PickColorButtonFactory.IconType.ICON16, setColorRealTime); - panel.add(pickColorButton); this.pane = panel; } @@ -434,7 +460,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { int total = columns; Color[] colors = DesignerEnvManager.getEnvManager().getColorConfigManager().getColors(); int size = colors.length; - for (int i = 0; i < total; i++) { + for (int i = 1; i <= total; i++) { ColorCell cell = (ColorCell) this.pane.getComponent(i); Color color = i < size ? colors[size - i - 1] : UsedColorPane.DEFAULT_COLOR; cell.setColor(color == null ? UsedColorPane.DEFAULT_COLOR : color); diff --git a/designer-base/src/main/java/com/fr/design/style/color/PickColorButtonFactory.java b/designer-base/src/main/java/com/fr/design/style/color/PickColorButtonFactory.java index f394801c89..a808d373fc 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/PickColorButtonFactory.java +++ b/designer-base/src/main/java/com/fr/design/style/color/PickColorButtonFactory.java @@ -1,12 +1,13 @@ package com.fr.design.style.color; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseUtils; import com.fr.design.gui.ibutton.SpecialUIButton; import com.fr.design.gui.ibutton.UIBasicButtonUI; import javax.swing.JButton; import javax.swing.JComponent; -import java.awt.Color; import java.awt.Cursor; import java.awt.Dimension; import java.awt.Graphics; @@ -20,9 +21,7 @@ import java.awt.event.MouseEvent; class PickColorButtonFactory { private static int iconSize; private static final int SIZE_16 = 16; - private static final int SIZE_18 = 18; - private static IconType iconType; - private static Image iconImage; + private static final int SIZE_24 = 24; /** * 生成取色按钮 @@ -33,17 +32,16 @@ class PickColorButtonFactory { */ static JButton getPickColorButton(final ColorSelectable colorSelectable, IconType iconType, final boolean setColorRealTime) { final SpecialUIButton pickColorButton = new SpecialUIButton(new WhiteButtonUI()); - PickColorButtonFactory.iconType = iconType; + pickColorButton.setIcon(new LazyIcon("color_picker")); + pickColorButton.setOpaque(false); if (iconType == IconType.ICON16) { - iconImage = BaseUtils.readImage("/com/fr/design/images/gui/colorPicker/colorPicker16.png"); iconSize = SIZE_16; } else { - iconImage = BaseUtils.readImage("/com/fr/design/images/gui/colorPicker/colorPicker18.png"); - iconSize = SIZE_18; + iconSize = SIZE_24; pickColorButton.setBorderPainted(false); } - pickColorButton.setPreferredSize(new Dimension(iconSize, iconSize)); + pickColorButton.setPreferredSize(FineUIScale.scale(new Dimension(iconSize, iconSize))); pickColorButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); // 不能使用 ActionListener，否则设计器工具栏中的取色按钮会有问题（REPORT-13654） @@ -64,30 +62,13 @@ class PickColorButtonFactory { * 取色按钮可使用的图标尺寸 */ public enum IconType { - ICON16, ICON18 + ICON16, ICON24 } private static class WhiteButtonUI extends UIBasicButtonUI { @Override public void paint(Graphics g, JComponent c) { super.paint(g, c); - Dimension size = c.getSize(); - g.setColor(Color.WHITE); - g.fillRoundRect(0, 0, size.width - 1, size.height - 1, 1, 1); - g.setColor(new Color(153, 153, 153)); // #999999 - g.drawRoundRect(0, 0, size.width - 1, size.height - 1, 1, 1); - if (iconType == IconType.ICON16) { - g.drawImage( - iconImage, - (size.width - iconImage.getWidth(null)) / 2, - (size.height - iconImage.getHeight(null)) / 2, - iconImage.getWidth(null), - iconImage.getHeight(null), - null - ); - } else { - g.drawImage(iconImage, 0, 0, iconSize, iconSize, null); - } } } } diff --git a/designer-base/src/main/java/com/fr/design/style/color/RecentUseColorPane.java b/designer-base/src/main/java/com/fr/design/style/color/RecentUseColorPane.java index 1e6d7be885..116220afd9 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/RecentUseColorPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/RecentUseColorPane.java @@ -18,13 +18,10 @@ public class RecentUseColorPane extends BasicPane implements ColorSelectable { public RecentUseColorPane(JColorChooser chooser) { this.chooser = chooser; - - // center - JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); - this.add(centerPane, BorderLayout.CENTER); // 最近使用 - UsedColorPane pane = new UsedColorPane(2, 10, this); - centerPane.add(pane.getPane()); + setLayout(new BorderLayout()); + UsedColorPane pane = new UsedColorPane(1, 20, this); + add(pane.getPane(), BorderLayout.WEST); } /** diff --git a/designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java b/designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java index 120a0c2134..74f4b409a6 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java +++ b/designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java @@ -1,5 +1,7 @@ package com.fr.design.style.color; +import com.fine.theme.utils.FineUIScale; + import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; @@ -68,8 +70,8 @@ public class SwatchChooserPanel extends AbstractColorChooserPanel{ int width = numCols * cellWidth + (numCols - 1) * gap; Insets insets = getInsets(); - return new Dimension(width + insets.left + insets.right, - height + insets.top + insets.bottom); + return FineUIScale.scale(new Dimension(width + insets.left + insets.right, + height + insets.top + insets.bottom)); } /** @@ -509,8 +511,8 @@ public class SwatchChooserPanel extends AbstractColorChooserPanel{ Insets insets = parent.getInsets(); - return new Dimension(insets.left + insets.right + xmax, - insets.top + insets.bottom + ymax); + return FineUIScale.scale(new Dimension(insets.left + insets.right + xmax, + insets.top + insets.bottom + ymax)); } diff --git a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java index c7c32f7956..d3f3600dfb 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java +++ b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java @@ -4,7 +4,7 @@ package com.fr.design.style.color; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButton; @@ -35,8 +35,14 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi private UIObserverListener uiObserverListener; public UIToolbarColorButton(Icon icon) { - super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup"))); + super(new UIColorButton(icon), new UIButton(new LazyIcon("popup"))); getLeftButton().setEventBanned(true); + set4Toolbar(); + + initListener(); + } + + private void initListener() { getRightButton().addFocusListener(new FocusListener() { @Override @@ -48,19 +54,12 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi hidePopupMenu(); } }); - iniListener(); - } - - private void iniListener() { if (shouldResponseChangeListener()) { - this.addColorChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - if (uiObserverListener == null) { - return; - } - uiObserverListener.doChange(); + this.addColorChangeListener(e -> { + if (uiObserverListener == null) { + return; } + uiObserverListener.doChange(); }); } } diff --git a/designer-base/src/main/java/com/fr/design/style/color/UsedColorPane.java b/designer-base/src/main/java/com/fr/design/style/color/UsedColorPane.java index a48f33c164..8d12a47c59 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/UsedColorPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/UsedColorPane.java @@ -65,7 +65,6 @@ public class UsedColorPane extends BasicPane { int total = columns * rows; JPanel panel = new JPanel(); panel.setLayout(new GridLayout(rows, columns, 1, 1)); - panel.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8)); //最近使用颜色 Color[] colors = DesignerEnvManager.getEnvManager().getColorConfigManager().getColors(); int size = colors.length; diff --git a/designer-base/src/main/java/com/fr/design/ui/util/UIUtil.java b/designer-base/src/main/java/com/fr/design/ui/util/UIUtil.java index 86093a6d82..c03550da2a 100644 --- a/designer-base/src/main/java/com/fr/design/ui/util/UIUtil.java +++ b/designer-base/src/main/java/com/fr/design/ui/util/UIUtil.java @@ -6,6 +6,8 @@ import com.fr.third.guava.base.Supplier; import org.jetbrains.annotations.NotNull; import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import java.awt.Color; import java.util.concurrent.TimeUnit; /** @@ -55,18 +57,18 @@ public class UIUtil { } } } - + /** * 有些时候，交互上需要有一些等待的效果， * 如果没有等待到， 会让交互失去作用。 * * @param supplier 结果 - * @param timeout 超时 + * @param timeout 超时 * @param timeUnit 单位 * @return 结果 */ public static T waitUntil(Supplier supplier, long timeout, TimeUnit timeUnit) { - + Stopwatch st = Stopwatch.createStarted(); T result = supplier.get(); long elapsed = st.elapsed(timeUnit); @@ -81,4 +83,8 @@ public class UIUtil { } return result; } + + public static Color getPanelBackageColor() { + return UIManager.getColor("Panel.background"); + } } diff --git a/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java b/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java index 2b768d995b..de9e0564d5 100644 --- a/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java +++ b/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java @@ -1,6 +1,6 @@ package com.fr.design.update.actions; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.os.impl.UpdateDialogAction; import com.fr.stable.os.support.OSBasedAction; @@ -15,7 +15,7 @@ public class SoftwareUpdateAction extends UpdateAction { public SoftwareUpdateAction() { setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_UpdateAndUpgrade")); - setSmallIcon("/com/fr/design/images/update/update_new"); + setSmallIcon(new LazyIcon("update")); } diff --git a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java index 6bad24c514..282b09d7fa 100644 --- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java @@ -1,6 +1,7 @@ package com.fr.design.update.ui.dialog; import com.fanruan.product.ProductConstants; +import com.fine.theme.utils.FineUIScale; import com.fr.decision.update.data.UpdateConstants; import com.fr.decision.update.info.UpdateCallBack; import com.fr.decision.update.info.UpdateProgressCallBack; @@ -13,6 +14,7 @@ import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -296,7 +298,7 @@ public class UpdateMainDialog extends UIDialog { loadingLabel = new LoadingLabel(); loadingLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Checking_Jar_Update")); updateButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Update")); - updateButton.setPreferredSize(UPDATE_BUTTON); + updateButton.setPreferredSize(FineUIScale.scale(UPDATE_BUTTON)); updateButton.setEnabled(false); double[] rowSize = {TableLayout.PREFERRED}; diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java index 8f44ae197e..980ac2c8a8 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java @@ -23,6 +23,7 @@ import com.fr.design.locale.impl.BbsRegisterMark; import com.fr.design.locale.impl.BbsResetMark; import com.fr.design.locale.impl.BbsSpaceMark; import com.fr.design.login.utils.DesignerLoginUtils; +import com.fr.design.ui.util.UIUtil; import com.fr.design.upm.event.DownloadEvent; import com.fr.design.upm.exec.UpmBrowserExecutor; import com.fr.design.upm.task.UpmTaskWorker; @@ -40,7 +41,6 @@ import com.teamdev.jxbrowser.chromium.Browser; import com.teamdev.jxbrowser.chromium.JSArray; import com.teamdev.jxbrowser.chromium.JSFunction; import com.teamdev.jxbrowser.chromium.JSObject; -import com.teamdev.jxbrowser.chromium.JSValue; import javax.swing.JFileChooser; import javax.swing.SwingUtilities; @@ -146,7 +146,7 @@ public class UpmBridge { @JSBridge public void closeWindow() { - UpmFinder.closeWindow(); + UIUtil.invokeLaterIfNeeded(UpmFinder::closeWindow); } diff --git a/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java b/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java index f189ccc300..dcb9738177 100644 --- a/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/ColorUtils.java @@ -1,5 +1,9 @@ package com.fr.design.utils; +import com.fr.general.ComparatorUtils; +import org.jetbrains.annotations.NotNull; + +import javax.swing.JScrollPane; import java.awt.Color; import java.awt.Component; import java.awt.Container; @@ -16,7 +20,7 @@ public class ColorUtils { * @param color 颜色 */ public static void syncBackground(Component component, Color color) { - + component.setBackground(color); if (component instanceof Container) { @@ -29,15 +33,17 @@ public class ColorUtils { } /** - * 递归的同步颜色，如何组件的背景颜色等于默认颜色的话，变更为 replaceColor + * 递归的同步颜色，如果组件的背景颜色等于默认颜色的话，变更为 replaceColor * * @param component 组件 * @param replaceColor 替换颜色 * @param defaultColor 默认颜色 */ - public static void syncBackgroundIfAbsent(Component component, Color replaceColor, Color defaultColor) { - - if (component.getBackground() != defaultColor) { + public static void syncBackgroundIfAbsent(Component component, Color replaceColor, @NotNull Color defaultColor) { + dealWithScrollPane(component, replaceColor, defaultColor); + + // 仅默认颜色时，递归替换 + if (!ComparatorUtils.equals(defaultColor, component.getBackground())) { return; } component.setBackground(replaceColor); @@ -49,7 +55,24 @@ public class ColorUtils { } } } - + + /** + * 滚动面板需处理view和scrollBar + */ + private static void dealWithScrollPane(Component component, Color replaceColor, Color defaultColor) { + if (component instanceof JScrollPane) { + JScrollPane scrollPane = (JScrollPane) component; + scrollPane.getViewport().setOpaque(false); + if (scrollPane.getVerticalScrollBar() != null) { + scrollPane.getVerticalScrollBar().setOpaque(false); + } + if (scrollPane.getHorizontalScrollBar() != null) { + scrollPane.getHorizontalScrollBar().setOpaque(false); + } + syncBackgroundIfAbsent(scrollPane.getViewport().getView(), replaceColor, defaultColor); + } + } + /** * 使背景透明 * diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index 6715764ef4..cc7f68ee39 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -1,5 +1,7 @@ package com.fr.design.utils; +import com.fine.theme.light.ui.laf.FineLightLaf; +import com.formdev.flatlaf.extras.FlatUIDefaultsInspector; import com.fanruan.workplace.http.HttpConstants; import com.fr.base.FeedBackInfo; import com.fr.base.ServerConfig; @@ -11,7 +13,6 @@ import com.fr.design.deeplink.DeepLinkCore; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.fun.DefaultValueAdjustProvider; import com.fr.design.fun.DesignerEnvProcessor; -import com.fr.design.gui.UILookAndFeel; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.ui.util.UIUtil; @@ -37,7 +38,6 @@ import com.fr.workspace.WorkContext; import org.jetbrains.annotations.NotNull; import javax.swing.SwingUtilities; -import javax.swing.UIManager; import java.awt.Desktop; import java.awt.Font; import java.io.BufferedReader; @@ -52,7 +52,6 @@ import java.net.ServerSocket; import java.net.Socket; import java.net.URI; import java.nio.charset.StandardCharsets; -import java.util.Enumeration; import java.util.Locale; import java.util.Set; import java.util.concurrent.Callable; @@ -307,23 +306,8 @@ public class DesignUtils { * p:初始化look and feel, 把一切放到这个里面.可以让多个地方调用. */ public static void initLookAndFeel() { - // p:隐藏对话框的系统标题风格，用look and feel定义的标题风格. - try { - UIManager.setLookAndFeel(UILookAndFeel.class.getName()); - } catch (Exception e) { - FineLoggerFactory.getLogger().error("Substance Raven Graphite failed to initialize"); - } - //获取当前系统语言下设计器用的默认字体 - FRFont guiFRFont = getDefaultGUIFont(); - //指定UIManager中字体 - Enumeration keys = UIManager.getDefaults().keys(); - while (keys.hasMoreElements()) { - String key = keys.nextElement().toString(); - - if (key.endsWith(".font")) { - UIManager.put(key, isTextField(key) ? getNamedFont("Dialog") : guiFRFont); - } - } + FineLightLaf.setup(); + FlatUIDefaultsInspector.install( "ctrl shift alt Y" ); } private static boolean isTextField(String key) { diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java index 91661301f1..ba1c377965 100644 --- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java @@ -16,6 +16,7 @@ import com.fr.data.util.function.SumFunction; import com.fr.design.actions.UpdateAction; import com.fr.design.actions.core.ActionFactory; import com.fr.design.border.UITitledBorder; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.fun.DefaultValueAdjustProvider; import com.fr.design.gui.ibutton.UIButton; @@ -90,6 +91,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + // Noninstantiable utility class public final class GUICoreUtils { @@ -992,12 +996,7 @@ public final class GUICoreUtils { dynamicPane.setVisible(e.getStateChange() == visibleState); } }); - JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - panel.add(checkBox, BorderLayout.NORTH); - JPanel dynamicPaneWrapper = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); - dynamicPaneWrapper.add(dynamicPane); - panel.add(dynamicPaneWrapper, BorderLayout.CENTER); - return panel; + return column(LayoutConstants.VERTICAL_GAP, cell(checkBox), cell(dynamicPane)).getComponent(); } /** diff --git a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java index 564b09d467..5725a2a889 100644 --- a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java +++ b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java @@ -1,5 +1,7 @@ package com.fr.design.web; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseUtils; import com.fr.base.GraphHelper; import com.fr.base.Icon; @@ -14,14 +16,10 @@ import com.fr.design.gui.ifilechooser.FileChooserFactory; import com.fr.design.gui.ifilechooser.FileChooserProvider; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.iscrollbar.UIScrollBar; -import com.fr.design.gui.itextarea.DescriptionTextArea; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.ImageUtils; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.ui.WidgetInfoConfig; import com.fr.general.ComparatorUtils; @@ -33,10 +31,8 @@ import com.fr.transaction.WorkerFacade; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Image; @@ -60,6 +56,11 @@ import java.awt.event.FocusListener; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; + /** * carl：自定义Icon编辑 */ @@ -86,11 +87,11 @@ public class CustomIconPane extends BasicPane { private void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); + UILabel iconLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"))); - JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); - centerPane.add(noNamePane, BorderLayout.CENTER); - + JPanel noNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + noNamePane.setBorder(new FineRoundBorder()); + noNamePane.setBackground(Color.WHITE); iconPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); // 开始加图标选择按钮 @@ -100,16 +101,16 @@ public class CustomIconPane extends BasicPane { refreshIconPane(false); jsPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); - jsPane.setPreferredSize(new Dimension(200, 180)); noNamePane.add(jsPane); - DescriptionTextArea des = new DescriptionTextArea(2); - des.setText(createDescriptionText()); - centerPane.add(des, BorderLayout.SOUTH); + UILabel desLabel = new UILabel(createDescriptionText()); + desLabel.setForeground(Color.GRAY); + centerPane.add(column( + cell(noNamePane).weight(0.9), + cell(desLabel).weight(0.1) + ).getComponent()); - this.add(centerPane, BorderLayout.CENTER); - - JPanel eastPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); + JPanel eastPane = new JPanel(new BorderLayout()); JPanel buttonPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); // 增加、删除、编辑按钮 @@ -117,9 +118,11 @@ public class CustomIconPane extends BasicPane { initRemoveButton(buttonPane); initEditButton(buttonPane); - eastPane.add(buttonPane); - this.add(eastPane, BorderLayout.EAST); - + eastPane.add(buttonPane, BorderLayout.NORTH); + this.add(column(10, + cell(iconLabel), + row(10, cell(centerPane).weight(0.9), cell(eastPane).weight(0.1)).weight(1.0) + ).getComponent()); } @@ -369,7 +372,7 @@ public class CustomIconPane extends BasicPane { g2d.drawImage(iconImage, ICON_X, ICON_Y, IconManager.DEFAULT_ICONWIDTH, IconManager.DEFAULT_ICONHEIGHT, null); } if (this.iconName != null && ComparatorUtils.equals(this.iconName, selectedIconName)) { - g2d.setPaint(Color.RED); + g2d.setPaint(Color.BLUE); } else { g2d.setPaint(Color.LIGHT_GRAY); } @@ -416,19 +419,11 @@ public class CustomIconPane extends BasicPane { private void init() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - double p = TableLayout.PREFERRED; - double[] rowSize = {p, p}; - double[] columnSize = {p, p}; UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon")); - browseButton.setPreferredSize(new Dimension(80, 25)); browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button")); nameTextField = new UITextField(20); - browseButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - onBrowseButtonClicked(SwingUtilities.getWindowAncestor(EditIconDialog.this)); - } - }); + browseButton.addActionListener(e -> onBrowseButtonClicked(SwingUtilities.getWindowAncestor(EditIconDialog.this))); // 焦点丢失时看看名称是否已经存在 nameTextField.addFocusListener(new FocusListener() { @@ -449,16 +444,22 @@ public class CustomIconPane extends BasicPane { } }); - JPanel imagePane = new JPanel(); - imagePane.setLayout(new FlowLayout(FlowLayout.LEFT, 30, 0)); showImageLabel = new UILabel(); - showImageLabel.setPreferredSize(new Dimension(50, 50)); - imagePane.add(showImageLabel); - imagePane.add(browseButton); - Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}}; - - JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - this.add(centerPane, BorderLayout.CENTER); + showImageLabel.setPreferredSize(FineUIScale.scale(new Dimension(50, 50))); + + JPanel centerPane = column(10, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":")).weight(1.2), + cell(nameTextField).weight(3) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":")).weight(1.2), + row( + cell(showImageLabel), column(fix(13), cell(browseButton), fix(13)).weight(1) + ).weight(3) + ) + ).getComponent(); + this.add(centerPane, BorderLayout.WEST); } private void onBrowseButtonClicked(Window parent) { diff --git a/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java b/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java index 69805979ba..f22f1eb0a6 100644 --- a/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java @@ -1,40 +1,40 @@ package com.fr.design.widget; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.web.CustomIconPane; import com.fr.form.ui.WidgetInfoConfig; - -import javax.swing.*; -import java.awt.*; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.Icon; +import javax.swing.JPanel; +import javax.swing.ImageIcon; +import java.awt.Image; +import java.awt.BorderLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + public class IconDefinePane extends BasicPane { private UILabel showIconImageLable; private UIButton editIconButton; private UIButton removeIconButton; private String curIconName; + private Icon curIcon; public IconDefinePane() { - JPanel iconPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - JPanel labelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - labelPane.setLayout(new /**/ FlowLayout(FlowLayout.LEFT, 20, 0)); showIconImageLable = new UILabel(); - showIconImageLable.setPreferredSize(new Dimension(20, 20)); editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); - JPanel iconButtonPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - labelPane.add(showIconImageLable); - iconPane.add(labelPane, BorderLayout.WEST); - iconPane.add(iconButtonPane, BorderLayout.EAST); - iconButtonPane.add(editIconButton); editIconButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -49,12 +49,17 @@ public class IconDefinePane extends BasicPane { IconDefinePane.this.repaint(); } }); + editDialog.addWindowFocusListener(new WindowAdapter() { + @Override + public void windowGainedFocus(WindowEvent e) { + editDialog.toFront(); + } + }); editDialog.setVisible(true); } }); removeIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); - iconButtonPane.add(removeIconButton); removeIconButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { curIconName = null; @@ -62,9 +67,10 @@ public class IconDefinePane extends BasicPane { } }); - this.add(this.showIconImageLable); - this.add(this.editIconButton); - this.add(this.removeIconButton); + JPanel iconButtonPane = row(LayoutConstants.HORIZONTAL_GAP, cell(this.showIconImageLable), cell(this.editIconButton), cell(this.removeIconButton)).getComponent(); + iconButtonPane.setBorder(new ScaledEmptyBorder(0,0,0,0)); + this.setLayout(new BorderLayout()); + this.add(iconButtonPane, BorderLayout.CENTER); } @Override @@ -86,6 +92,16 @@ public class IconDefinePane extends BasicPane { setShowIconImage(); } + /** + * 直接更新icon + * @param iconName + * @param icon + */ + public void populateIcon(String iconName, Icon icon) { + this.curIconName = iconName; + showIconImageLable.setIcon(icon); + } + public String update() { return this.curIconName; } diff --git a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java index 2b2dcc532c..a7013353b9 100644 --- a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java @@ -1,21 +1,25 @@ package com.fr.design.widget; -import com.fr.design.designer.IntervalConstants; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; -import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.SwingConstants; -import java.awt.BorderLayout; import java.awt.Component; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fr.design.constants.LayoutConstants.VERTICAL_GAP; +import static com.fr.design.constants.LayoutConstants.HORIZONTAL_GAP; +import static com.fr.design.constants.LayoutConstants.LEFT_WEIGHT; +import static com.fr.design.constants.LayoutConstants.RIGHT_WEIGHT; + /** * Created by plough on 2017/8/7. */ @@ -44,23 +48,15 @@ public class WidgetBoundsPaneFactory { } } - private static final int RIGHT_PANE_WIDTH = 145; - public static UIExpandablePane createBoundsPane(UISpinner width, UISpinner height, JComponent ratioLocked, NameAttribute nameAttribute) { - JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - Component[][] components = new Component[][]{ - new Component[]{FRWidgetFactory.createLineWrapLabel(nameAttribute.getSizeName()), - ratioLocked != null ? createRightPane(width, ratioLocked, height) : createRightPane(width, height)}, - new Component[]{null, createRightPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER))}, - }; - double[] rowSize = {p, p}; - double[] columnSize = {f, RIGHT_PANE_WIDTH}; - int[][] rowCount = ratioLocked != null ? new int[][]{{1, 1}, {1, 1, 1}} : new int[][]{{1, 1}, {1, 1}}; - final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W5, IntervalConstants.INTERVAL_L6); - panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); - boundsPane.add(panel); + final JPanel boundsPane = column(VERTICAL_GAP, + row( + cell(FRWidgetFactory.createLineWrapLabel(nameAttribute.getSizeName())).weight(LEFT_WEIGHT), + cell(ratioLocked != null ? createRightPane(width, ratioLocked, height) : createRightPane(width, height)).weight(RIGHT_WEIGHT) + ), + cell(createRightPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), + new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER))) + ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, 10, 0))).getComponent(); return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane); } @@ -69,33 +65,24 @@ public class WidgetBoundsPaneFactory { } public static JPanel createRightPane(Component com1, Component com2) { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] rowSize = {p}; - double[] columnSize = {f, f}; - int[][] rowCount = {{1, 1}}; - Component[][] components = new Component[][]{ - new Component[]{com1, com2} - }; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L1); + return row(HORIZONTAL_GAP, + cell(com1).weight(0.5), cell(com2).weight(0.5) + ).getComponent(); } public static JPanel createRightPane(Component com1, Component com2, Component com3) { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double[] rowSize = {p}; - double[] columnSize = {f, 24, f}; - int[][] rowCount = {{1, 1, 1}}; - Component[][] components = new Component[][]{ - new Component[]{com1, com2, com3} - }; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 0, IntervalConstants.INTERVAL_L1); + if (com2 != null) { + return row( + cell(com1).weight(1), cell(com2).weight(0.3), cell(com3).weight(1) + ).getComponent(); + } + return row( + cell(com1).weight(1), flex(0.3), cell(com3).weight(1) + ).getComponent(); + } public static UIExpandablePane createAbsoluteBoundsPane(UISpinner x, UISpinner y, UISpinner width, UISpinner height, JComponent ratioLocked, NameAttribute nameAttribute) { - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - UILabel positionLabel = FRWidgetFactory.createLineWrapLabel(nameAttribute.getPositionName()); UILabel xLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_X_Coordinate"), SwingConstants.CENTER); UILabel yLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Y_Coordinate"), SwingConstants.CENTER); @@ -104,24 +91,24 @@ public class WidgetBoundsPaneFactory { UILabel widthLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER); UILabel heightLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER); - Component[][] northComponents = new Component[][]{ - new Component[]{positionLabel, ratioLocked != null ? createRightPane(x, null, y) : createRightPane(x, y)}, - new Component[]{null, ratioLocked != null ? createRightPane(xLabel, null, yLabel) : createRightPane(xLabel, yLabel)}, - }; - Component[][] centerComponents = new Component[][]{ - new Component[]{sizeLabel, ratioLocked != null ? createRightPane(width, ratioLocked, height) : createRightPane(width, height)}, - new Component[]{null, ratioLocked != null ? createRightPane(widthLabel, null, heightLabel) : createRightPane(widthLabel, heightLabel)}, - }; - double[] rowSize = {p, p}; - double[] columnSize = {f, RIGHT_PANE_WIDTH}; - int[][] rowCount = ratioLocked != null ? new int[][]{{1, 1, 1}, {1, 1, 1}} : new int[][]{{1, 1}, {1, 1}}; - final JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(northComponents, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W5, IntervalConstants.INTERVAL_L6); - final JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(centerComponents, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W5, IntervalConstants.INTERVAL_L6); - JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - northPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); - centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); - boundsPane.add(northPanel, BorderLayout.NORTH); - boundsPane.add(centerPanel, BorderLayout.CENTER); + JPanel boundsPane = column(VERTICAL_GAP, + row( + cell(positionLabel).weight(LEFT_WEIGHT), + cell(ratioLocked != null ? createRightPane(x, null, y) : createRightPane(x, y)).weight(RIGHT_WEIGHT) + ), + row( + flex(LEFT_WEIGHT), + cell(ratioLocked != null ? createRightPane(xLabel, null, yLabel) : createRightPane(xLabel, yLabel)).weight(RIGHT_WEIGHT) + ), + row( + cell(sizeLabel).weight(LEFT_WEIGHT), + cell(ratioLocked != null ? createRightPane(width, ratioLocked, height) : createRightPane(width, height)).weight(RIGHT_WEIGHT) + ), + row( + flex(LEFT_WEIGHT), + cell(ratioLocked != null ? createRightPane(widthLabel, null, heightLabel) : createRightPane(widthLabel, heightLabel)).weight(RIGHT_WEIGHT) + ) + ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, 10, 0))).getComponent(); return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 230, 24, boundsPane); } @@ -135,18 +122,11 @@ public class WidgetBoundsPaneFactory { public static UIExpandablePane createCardTagBoundPane(UISpinner width) { - JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - Component[][] components = new Component[][]{ - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Component_Size")), width}, - }; - double[] rowSize = {p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1}}; - final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6); - panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); - boundsPane.add(panel); + final JPanel boundsPane = column(VERTICAL_GAP, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Component_Size"))).weight(LEFT_WEIGHT), + cell(width).weight(RIGHT_WEIGHT) + ).getComponent(); + return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane); } } diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java index d146c73099..66994ef844 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java @@ -4,19 +4,22 @@ import java.awt.*; import javax.swing.*; -import com.fr.design.designer.IntervalConstants; import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.gui.icombobox.DictionaryComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.widget.accessibles.AccessibleIconEditor; import com.fr.form.ui.Button; import com.fr.stable.StableUtils; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fr.design.constants.LayoutConstants.VERTICAL_GAP; +import static com.fr.design.constants.LayoutConstants.LEFT_WEIGHT; +import static com.fr.design.constants.LayoutConstants.RIGHT_WEIGHT; + /** * Created by IntelliJ IDEA. * Author : Richer @@ -34,32 +37,38 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt } private void initComponents() { - this.setLayout(new BorderLayout(7, 7)); - JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - double rowSize[] = {p, p, p, p}; - double columnSize[] = {p, f}; - JPanel labelPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + this.setLayout(new BorderLayout()); + JPanel advancePane = column(VERTICAL_GAP).getComponent(); + iconPane = new AccessibleIconEditor(); - labelPane.add(iconPane); - Component comp = createCenterPane(); - Component[][] n_components = { - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createCustomButtonTypeComboBox()}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField = new UITextField()}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon")), iconPane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")), hotkeysTextField = new UITextField()}, - }; + buttonNameTextField = new UITextField(); + hotkeysTextField = new UITextField(); hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ",")); - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); - panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); - advancePane.add(panel, BorderLayout.NORTH); + + Component comp = createCenterPane(); + advancePane.add(column(VERTICAL_GAP, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type"))).weight(LEFT_WEIGHT), + cell(createCustomButtonTypeComboBox()).weight(RIGHT_WEIGHT) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name"))).weight(LEFT_WEIGHT), + cell(buttonNameTextField).weight(RIGHT_WEIGHT) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon"))).weight(LEFT_WEIGHT), + cell(iconPane).weight(RIGHT_WEIGHT) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys"))).weight(LEFT_WEIGHT), + cell(hotkeysTextField).weight(RIGHT_WEIGHT) + ) + ).getComponent()); if(comp != null ) { - advancePane.add(comp,BorderLayout.CENTER); + advancePane.add(comp); } UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 280, 20, advancePane); this.add(uiExpandablePane); - } protected abstract Component createCenterPane(); diff --git a/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java b/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java index 99e642425b..98e4844ade 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java @@ -1,20 +1,22 @@ package com.fr.design.widget.component; -import com.fr.design.designer.IntervalConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.widget.accessibles.AccessibleImgBackgroundEditor; import com.fr.form.ui.Widget; -import javax.swing.BorderFactory; import javax.swing.JPanel; -import java.awt.BorderLayout; -import java.awt.Component; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fr.design.constants.LayoutConstants.LEFT_WEIGHT; +import static com.fr.design.constants.LayoutConstants.RIGHT_WEIGHT; +import static com.fr.design.constants.LayoutConstants.VERTICAL_GAP; /** * Created by ibm on 2017/8/6. @@ -35,25 +37,30 @@ public abstract class BackgroundCompPane extends BasicPane { UILabel headLabel = createUILable(); initBackgroundEditor(); String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")}; - - double f = TableLayout.FILL; - final double p = TableLayout.PREFERRED; - double[] rowSize = {p, p, p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1},{1, 1},{1, 1}}; - Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")), initialBackgroundEditor}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")), overBackgroundEditor}, - new Component[]{getClickLabel(), clickBackgroundEditor}, - }; - panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); - panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); backgroundHead = new UIButtonGroup(titles); - JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ - new Component[]{headLabel, backgroundHead}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1); - - this.add(headPane, BorderLayout.NORTH); - this.add(panel, BorderLayout.CENTER); + panel = column(VERTICAL_GAP, + row( + flex(LEFT_WEIGHT), + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial"))).weight(RIGHT_WEIGHT / 2), + cell(initialBackgroundEditor).weight(RIGHT_WEIGHT / 2) + ), + row( + flex(LEFT_WEIGHT), + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over"))).weight(RIGHT_WEIGHT / 2), + cell(overBackgroundEditor).weight(RIGHT_WEIGHT / 2) + ), + row( + flex(LEFT_WEIGHT), + cell(getClickLabel()).weight(RIGHT_WEIGHT / 2), + cell(clickBackgroundEditor).weight(RIGHT_WEIGHT / 2) + ) + ).getComponent(); + this.add(column(VERTICAL_GAP, + row( + cell(headLabel).weight(LEFT_WEIGHT), + cell(backgroundHead).weight(RIGHT_WEIGHT) + ) + ).getComponent()); } diff --git a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java index 656b42283c..57df8937fa 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java @@ -1,5 +1,6 @@ package com.fr.design.widget.component; +import com.fine.swing.ui.layout.Column; import com.fr.base.BaseFormula; import com.fr.design.constants.LayoutConstants; import com.fr.design.editor.editor.DateEditor; @@ -7,54 +8,69 @@ import com.fr.design.editor.editor.Editor; import com.fr.design.editor.editor.FormulaEditor; import com.fr.design.editor.editor.NoneEditor; import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.design.gui.ilable.UILabel; import com.fr.general.ComparatorUtils; +import com.fr.stable.StringUtils; import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.awt.*; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; + /** - * Created by ibm on 2017/8/8. + * 日期设置面板 + * + * @author ibm + * @since 10.0 + * Created on 2017/08/08 */ -public class DateValuePane extends JPanel { +public class DateValuePane extends Column { private UIButtonGroup widgetValueHead; private Editor[] editor; private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"); private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"); private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"); - public DateValuePane() { + this(StringUtils.EMPTY); + } + + public DateValuePane(String title) { + setSpacing(LayoutConstants.VERTICAL_GAP); + UILabel titleLabel = new UILabel(title); editor = new Editor[]{ new NoneEditor(null, NONE_EDITOR_NAME), new DateEditor(true, DATE_EDITOR_NAME), new FormulaEditor(FORMULA_EDITOR_NAME) }; - this.setLayout(new BorderLayout(0, LayoutConstants.VGAP_SMALL)); final CardLayout cardLayout = new CardLayout(); final JPanel customPane = new JPanel(cardLayout); + final JPanel customRow = row(flex(1.2), cell(customPane).weight(3)).getComponent(); final String[] tabTitles = new String[editor.length]; for (int i = 0; i < editor.length; i++) { customPane.add(editor[i], editor[i].getName()); tabTitles[i] = editor[i].getName(); } widgetValueHead = new UIButtonGroup(tabTitles); - widgetValueHead.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - int index = widgetValueHead.getSelectedIndex(); - if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"))) { - customPane.setVisible(false); - } else { - customPane.setVisible(true); - } - cardLayout.show(customPane, tabTitles[index]); - } + widgetValueHead.addChangeListener(e -> { + int index = widgetValueHead.getSelectedIndex(); + customRow.setVisible(!ComparatorUtils.equals(tabTitles[index], + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"))); + cardLayout.show(customPane, tabTitles[index]); }); - this.add(widgetValueHead, BorderLayout.NORTH); - this.add(customPane, BorderLayout.CENTER); + if (StringUtils.isNotEmpty(title)) { + this.add( + row( + cell(titleLabel).weight(1.2), cell(widgetValueHead).weight(3) + ), + cell(customRow) + ); + } else { + this.add(cell(widgetValueHead),cell(customPane)); + } } diff --git a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java index 867d66cdfd..38cc90db87 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java @@ -3,30 +3,31 @@ package com.fr.design.widget.component; import com.fr.design.ExtraDesignClassManager; import com.fr.design.beans.ErrorMsgTextFieldAdapter; import com.fr.design.beans.UITextFieldAdapter; +import com.fr.design.constants.LayoutConstants; import com.fr.design.designer.IntervalConstants; import com.fr.design.fun.TextFieldAdapterProvider; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.NumberEditor; import com.fr.log.FineLoggerFactory; import com.fr.stable.AssistUtils; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; + /** * Created by kerry on 2017/9/10. */ @@ -63,45 +64,40 @@ public class NumberEditorValidatePane extends JPanel { private void initComponent() { initListeners(); this.allowDecimalsCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Decimals")); - allowDecimalsCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.allowDecimalsCheckBox.addActionListener(allowDecimalsListener); this.decimalLength = new UISpinner(0, Integer.MAX_VALUE, 1, 16); this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Negative")); this.allowNegativeCheckBox.addActionListener(allowNegativeListener); - allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.setMaxValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Need_Max_Value"), false); - setMaxValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.maxValueSpinner = new UISpinner(-Double.MAX_VALUE, Double.MAX_VALUE, 1D, 0D); this.setMaxValueCheckBox.addActionListener(setMaxListener); this.maxValueSpinner.addChangeListener(maxValueChangeListener); this.setMinValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Need_Min_Value"), false); this.minValueSpinner = new UISpinner(-Double.MAX_VALUE, Double.MAX_VALUE, 1D, 0D); - minValueSpinner.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.setMinValueCheckBox.addActionListener(setMinListener); this.minValueSpinner.addChangeListener(minValueChangeListener); - setMinValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); initErrorMsgPane(); JPanel errorMsgBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - errorMsgBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0)); errorMsgBorderPane.add(errorMsgTextFieldPane, BorderLayout.CENTER); UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits")); - limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); - limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0)); - double f = TableLayout.FILL; - double p = TableLayout.PREFERRED; - Component[][] components = new Component[][]{ - new Component[]{allowDecimalsCheckBox, null}, - new Component[]{limitNumberPane, null}, - new Component[]{allowNegativeCheckBox, null}, - new Component[]{setMaxValueCheckBox, maxValueSpinner}, - new Component[]{setMinValueCheckBox, minValueSpinner}, - new Component[]{errorMsgBorderPane, null}, - }; - double[] rowSize = {p, p, p, p, p, p}; - double[] columnSize = {p, f}; - int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); - this.add(panel); + + limitNumberPane = row( + cell(numberLabel).weight(1.2), + cell(decimalLength).weight(3) + ).getComponent(); + + this.add(column(LayoutConstants.VERTICAL_GAP, + cell(allowDecimalsCheckBox), + cell(limitNumberPane), + cell(allowNegativeCheckBox), + row(10, + cell(setMaxValueCheckBox).weight(1.8), cell(maxValueSpinner).weight(3) + ), + row(10, + cell(setMinValueCheckBox).weight(1.8), cell(minValueSpinner).weight(3) + ), + cell(errorMsgBorderPane) + ).getComponent()); } private void initErrorMsgPane() { @@ -128,10 +124,8 @@ public class NumberEditorValidatePane extends JPanel { public void actionPerformed(ActionEvent e) { if (allowDecimalsCheckBox.isSelected()) { limitNumberPane.setVisible(true); - limitNumberPane.setPreferredSize(new Dimension(215, 20)); } else { limitNumberPane.setVisible(false); - limitNumberPane.setPreferredSize(new Dimension(0, 0)); } } }; diff --git a/designer-base/src/main/java/com/fr/design/widget/component/ReturnTypePane.java b/designer-base/src/main/java/com/fr/design/widget/component/ReturnTypePane.java index 4f3b93a539..0812c94783 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/ReturnTypePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/ReturnTypePane.java @@ -1,18 +1,18 @@ package com.fr.design.widget.component; -import com.fr.design.designer.IntervalConstants; +import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.icombobox.DictionaryComboBox; import com.fr.design.gui.icombobox.DictionaryConstants; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.ReturnTypeProvider; -import javax.swing.BorderFactory; import javax.swing.JPanel; -import java.awt.BorderLayout; -import java.awt.Component; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; public class ReturnTypePane extends JPanel { @@ -31,22 +31,32 @@ public class ReturnTypePane extends JPanel { startComboBox.setEditable(true); endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays); endComboBox.setEditable(true); - Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")), delimiterComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")), startComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")), endComboBox} - }; - returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1); + + returnStringPane = column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter"))).weight(1.2), + cell(delimiterComboBox).weight(3) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol"))).weight(1.2), + cell(startComboBox).weight(3) + ), + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol"))).weight(1.2), + cell(endComboBox).weight(3) + ) + ).getComponent(); returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Array"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_String")}); returnTypeComboBox.addActionListener(e -> checkVisible(returnTypeComboBox.getSelectedIndex())); - JPanel headPane = TableLayoutHelper.createGapTableLayoutPane( - new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Date_Selector_Return_Type")), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); - JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - jPanel.add(headPane, BorderLayout.NORTH); - jPanel.add(returnStringPane, BorderLayout.CENTER); - returnStringPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0)); - this.add(jPanel); + + this.add(column(LayoutConstants.VERTICAL_GAP, + row( + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Date_Selector_Return_Type"))).weight(1.2), + cell(returnTypeComboBox).weight(3) + ), + cell(returnStringPane) + ).getComponent()); } public void setReturnType(ReturnType returnType) { diff --git a/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java b/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java index 20b82467bb..b2ebf896af 100644 --- a/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java @@ -4,8 +4,6 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.Widget; - -import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.SwingConstants; @@ -17,7 +15,7 @@ public class WidgetMobilePane extends JPanel { public static WidgetMobilePane DEFAULT_PANE = new WidgetMobilePane(); public WidgetMobilePane() { - this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + this.setBorder(null); init(); } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java index 6e4f2d803f..9c1a65b723 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java @@ -1,5 +1,7 @@ package com.fr.design.write.submit; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.GraphHelper; import com.fr.data.AbstractClassJob; import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane; @@ -22,6 +24,11 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.flex; + /** * Author : Shockway * Date: 13-7-29 @@ -30,26 +37,25 @@ import java.awt.event.ActionListener; public abstract class CustomJobPane extends BasicBeanPane { protected UITextField classNameTextField; protected ObjectProperiesPane objectProperiesPane; - private static final int DEFAULT_LENGTH = 25; + private static final int DEFAULT_LENGTH = 33; public CustomJobPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel reportletNamePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - classNameTextField = new UITextField(getLengthOfTextField()); - reportletNamePane.add(classNameTextField); + classNameTextField = new UITextField(); + classNameTextField.setPreferredSize(FineUIScale.scale(new Dimension(0, 24))); UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")); browserButton.setPreferredSize(new Dimension( - GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 20, - classNameTextField.getPreferredSize().height)); + GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 40, + FineUIScale.scale(24))); UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); editButton.setPreferredSize(new Dimension( - GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 20, - classNameTextField.getPreferredSize().height)); + GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 40, + FineUIScale.scale(24))); - reportletNamePane.add(browserButton); - reportletNamePane.add(editButton); + UITextArea area = new UITextArea(2, 1); browserButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { @@ -60,6 +66,7 @@ public abstract class CustomJobPane extends BasicBeanPane { new DialogActionAdapter() { public void doOk() { classNameTextField.setText(bPane.getClassPath()); + area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask")); checkAddButtonEnable(); } }).setVisible(true); @@ -73,6 +80,7 @@ public abstract class CustomJobPane extends BasicBeanPane { new DialogActionAdapter() { public void doOk() { classNameTextField.setText(javaEditorPane.getClassText()); + area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask")); checkAddButtonEnable(); } }); @@ -86,24 +94,28 @@ public abstract class CustomJobPane extends BasicBeanPane { } }); - reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null)); - this.add(reportletNamePane, BorderLayout.NORTH); + reportletNamePane.setLayout(new BorderLayout()); + reportletNamePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + reportletNamePane.add(row(4, + cell(classNameTextField).weight(1.0), + cell(browserButton), + cell(editButton) + ).getComponent(), BorderLayout.CENTER); objectProperiesPane = new ObjectProperiesPane(); - objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null)); - this.add(objectProperiesPane, BorderLayout.CENTER); - - UITextArea area = new UITextArea(2, 1); - area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask")); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + dsPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); dsPane.add(area); - dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null)); - this.add(dsPane, BorderLayout.SOUTH); + this.add(column(20, + cell(FineUIUtils.wrapComponentWithTitle(reportletNamePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"))), + cell(FineUIUtils.wrapComponentWithTitle(objectProperiesPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"))).weight(1.0), + cell(FineUIUtils.wrapComponentWithTitle(dsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"))) + ).getComponent()); checkAddButtonEnable(); } public int getLengthOfTextField() { - return DEFAULT_LENGTH; + return FineUIScale.scale(DEFAULT_LENGTH); } protected String title4PopupWindow() { diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationInWidgetEventPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationInWidgetEventPane.java index 30aa79f77f..14f92a68e2 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationInWidgetEventPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationInWidgetEventPane.java @@ -1,8 +1,15 @@ package com.fr.design.write.submit; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; +import com.fr.design.layout.FRGUIPaneFactory; + import javax.swing.*; import java.awt.*; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + /** * Created with IntelliJ IDEA. * User: zheng @@ -15,19 +22,19 @@ public class DBManipulationInWidgetEventPane extends DBManipulationPane { super(); } - protected void setBorderAndLayout(JPanel jPanel){ - jPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); - } - protected void addComponent(JPanel mainPane,JScrollPane addPane){ } protected Dimension createConditionPanePreferredSize(){ - return new Dimension(454, 30); + return FineUIScale.scale(new Dimension(454, 20)); + } + + protected boolean setJpVisible() { + return false; } protected Dimension createControlBtnPanePreferredSize(){ - return new Dimension(92, 20); + return FineUIScale.scale(new Dimension(110, 20)); } protected String setControlBtnPanePosition(){ diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 46b11d2a89..1aa1422f15 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -1,7 +1,13 @@ package com.fr.design.write.submit; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; +import com.fine.swing.ui.layout.Spacer; +import com.fine.theme.light.ui.FineTableHeaderUI; +import com.fine.theme.utils.FineClientProperties; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.BaseFormula; -import com.fr.base.BaseUtils; import com.fr.base.Parameter; import com.fr.data.DataConstants; import com.fr.data.condition.JoinCondition; @@ -14,6 +20,7 @@ import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.ChoosePaneSupportFormula; import com.fr.design.data.datapane.DataBaseItems; import com.fr.design.data.tabledata.tabledatapane.FormatExplanationPane; +import com.fr.design.dialog.AttrScrollPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; @@ -25,13 +32,16 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; +import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.icontainer.UIVerticalScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.CheckBoxList; +import com.fr.design.gui.itable.FineUITable; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; +import com.fr.design.i18n.Toolkit; import com.fr.design.javascript.JavaScriptActionPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.scrollruler.ModLineBorder; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.DateUtils; @@ -48,11 +58,15 @@ import com.fr.write.config.InsertConfig; import com.fr.write.config.IntelliDMLConfig; import com.fr.write.config.UpdateConfig; +import java.awt.*; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; import javax.swing.DefaultCellEditor; import javax.swing.DefaultComboBoxModel; import javax.swing.Icon; +import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JPanel; @@ -60,20 +74,16 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JTree; import javax.swing.ListSelectionModel; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.plaf.UIResource; import javax.swing.table.AbstractTableModel; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.GridLayout; -import java.awt.Image; -import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; @@ -83,14 +93,20 @@ import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.EventObject; import java.util.List; +import java.util.stream.Collectors; + +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; //august：这个东西应该分成两类，一类是有单元格的情况，一类是没有单元格的情况 public class DBManipulationPane extends BasicBeanPane { - private static final Image ICODS_IMAGE = BaseUtils.readImage("/com/fr/web/core/css/images/icons.png"); - private static final Icon HEIP_ICON = BaseUtils.createIcon(ICODS_IMAGE, 193, 1, 14, 14); + private static final Icon HEIP_ICON = new LazyIcon("jumpHelp"); private static final int DEFAULT_RETURN_VALUE = 4; public KeyColumnNameValueTable keyColumnValuesTable; private UIComboBox columnsComboBox; // 用于编辑ColumnName的Editor @@ -140,38 +156,46 @@ public class DBManipulationPane extends BasicBeanPane { this.v_Types = v_Types; JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(northPane, BorderLayout.NORTH); dmlConfigComboBox = new UIComboBox(DML_CONFIG_TYPES); + dmlConfigComboBox.putClientProperty(FineClientProperties.COMBO_BOX_TYPE, FineClientProperties.ADAPTIVE_COMBO_BOX); - JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox}, - FlowLayout.LEFT, 10); - typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))); - northPane.add(typePane, BorderLayout.NORTH); - + JPanel typePane = new JPanel(new BorderLayout()); + typePane.add(row(10, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type"))), + cell(dmlConfigComboBox)).getComponent()); chooseTable = new ChoosePaneSupportFormula(); - chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table"))); - chooseTable.setTableNameComboBoxPopSize(160, 320); - - northPane.add(chooseTable, BorderLayout.CENTER); + chooseTable.setTableNameComboBoxPopSize(FineUIScale.scale(160), FineUIScale.scale(320)); // peter:编辑的TablePane - JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(editTablePane, BorderLayout.CENTER); - editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"))); - + JPanel editTablePane = new JPanel(new BorderLayout(FineUIScale.scale(10), 0)); + Dimension editTableDimension = createEditTablePreferredSize(); + editTablePane.setBounds(0, 0, editTableDimension.width, editTableDimension.height); keyColumnValuesTable = new KeyColumnNameValueTable(); - editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER); + editTablePane.add(new UIVerticalScrollPane(keyColumnValuesTable), BorderLayout.CENTER); keyColumnValuesTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - keyColumnValuesTable.setPreferredScrollableViewportSize(new Dimension(280, 180)); + keyColumnValuesTable.setPreferredScrollableViewportSize(FineUIScale.scale(new Dimension(280, 150))); keyColumnValuesTable.setShowHorizontalLines(true); + northPane.add(column(10, + cell(FineUIUtils.wrapComponentWithTitle(typePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))), + cell(FineUIUtils.wrapComponentWithTitle(chooseTable, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table")))) + .getComponent()); + JPanel bottomPane = initBottomPane(); + + JPanel contentPane = new JPanel(new BorderLayout()); + contentPane.add(column(10, + cell(northPane), + cell(FineUIUtils.wrapComponentWithTitle(editTablePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"))), + cell(bottomPane)) + .getComponent(), BorderLayout.CENTER); + + this.add(new UIScrollPane(contentPane)); + initJTableColumn(); addButtons(editTablePane); - addBottomPane(); - addListeners(); } @@ -187,15 +211,12 @@ public class DBManipulationPane extends BasicBeanPane { // alex:添加操作按钮 UpdateAction[] actions = this.getActions(); if (actions != null && actions.length > 0) { - JPanel controlBtnPane = new JPanel(new GridLayout(actions.length + 1, 1, 4, 4)); + JPanel controlBtnPane = new JPanel(new BorderLayout()); editTablePane.add(GUICoreUtils.createBorderPane(controlBtnPane, BorderLayout.NORTH), BorderLayout.EAST); + List buttonGroup = Arrays.stream(actions).map(action -> cell(new UIButton(action))).collect(Collectors.toList()); - for (UpdateAction action : actions) { - controlBtnPane.add(new UIButton(action)); - } checkBoxUpdatePane = new JPanel(new BorderLayout(0, 0)); checkBoxUpdatePane.setPreferredSize(new Dimension(120, 20)); - controlBtnPane.add(checkBoxUpdatePane); UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_NotChange_Unmodified")); UIButton helpButton = new UIButton(HEIP_ICON); @@ -211,8 +232,9 @@ public class DBManipulationPane extends BasicBeanPane { } }); helpButton.set4ToolbarButton(); - checkBoxUpdatePane.add(UpdateCheckBox, BorderLayout.WEST); - checkBoxUpdatePane.add(helpButton, BorderLayout.EAST); + buttonGroup.add(row(5, cell(UpdateCheckBox), + cell(helpButton))); + controlBtnPane.add(column(5, buttonGroup.toArray(new Layouts.Cell[0])).getComponent()); } } @@ -241,16 +263,19 @@ public class DBManipulationPane extends BasicBeanPane { UpdateCheckBox.setEnabled(b); } - private void addBottomPane() { - JPanel eventPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + protected JPanel initBottomPane() { + JPanel eventPane = new JPanel(new BorderLayout()); + eventPane.setPreferredSize(createControlBtnPanePreferredSize()); eventPane.add(addEventButton()); JPanel conditionPane = this.createConditionPane(); JPanel btPane = new JPanel(FRGUIPaneFactory.createBorderLayout()); - btPane.add(eventPane, BorderLayout.CENTER); - btPane.add(conditionPane, BorderLayout.NORTH); - this.add(btPane, BorderLayout.SOUTH); + btPane.add(column(5, + cell(FineUIUtils.wrapComponentWithTitle(conditionPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"))), + row(cell(eventPane), cell(new UILabel())) + ).getComponent()); + return btPane; } private UIButton addEventButton() { @@ -278,7 +303,6 @@ public class DBManipulationPane extends BasicBeanPane { private JPanel createConditionPane() { JPanel conditionPane = new JPanel(); - conditionPane.setPreferredSize(createConditionPanePreferredSize()); setBorderAndLayout(conditionPane); @@ -290,9 +314,11 @@ public class DBManipulationPane extends BasicBeanPane { DefaultTreeCellRenderer cr = (DefaultTreeCellRenderer) conditionsTree.getCellRenderer(); cr.setForeground(UIConstants.NORMAL_BACKGROUND); JScrollPane jp = new JScrollPane(conditionsTree); - addComponent(conditionPane, jp); - - UIButton addSubmitConditionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Condition")); + jp.setPreferredSize(createJpPreferredSize()); + jp.setVisible(setJpVisible()); + String submitCondition = Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Condition"); + UIButton addSubmitConditionButton = new UIButton(submitCondition); + addSubmitConditionButton.setToolTipText(submitCondition); addSubmitConditionButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -316,35 +342,53 @@ public class DBManipulationPane extends BasicBeanPane { refreshConditionList(); } }); + dialog.addWindowFocusListener(new WindowAdapter() { + @Override + public void windowGainedFocus(WindowEvent e) { + dialog.toFront(); + } + }); dialog.setVisible(true); } }); - JPanel controlBtnPane = new JPanel(new GridLayout(1, 1, 4, 4)); + JPanel controlBtnPane = new JPanel(new BorderLayout()); controlBtnPane.setPreferredSize(createControlBtnPanePreferredSize()); - conditionPane.add(GUICoreUtils.createBorderPane(controlBtnPane, BorderLayout.NORTH), setControlBtnPanePosition()); - controlBtnPane.add(addSubmitConditionButton); + controlBtnPane.add(addSubmitConditionButton, BorderLayout.NORTH); + conditionPane.setPreferredSize(createConditionPanePreferredSize()); + conditionPane.add(controlBtnPane, setControlBtnPanePosition()); + conditionPane.add(jp, BorderLayout.CENTER); return conditionPane; } protected void setBorderAndLayout(JPanel jPanel) { jPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); - jPanel.setBorder(BorderFactory.createTitledBorder( - new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"))); } protected void addComponent(JPanel mainPane, JScrollPane addPane) { mainPane.add(addPane, BorderLayout.CENTER); } + protected Dimension createEditTablePreferredSize() { + return FineUIScale.scale(new Dimension(280, 180)); + } protected Dimension createConditionPanePreferredSize() { - return new Dimension(454, 80); + return FineUIScale.scale(new Dimension(454, 60)); } + protected boolean setJpVisible() { + return true; + } + + protected Dimension createJpPreferredSize() { + return FineUIScale.scale(new Dimension(280, 60)); + } + + protected Dimension createControlBtnPanePreferredSize() { - return new Dimension(110, 20); + return FineUIScale.scale(new Dimension(110, 20)); } protected String setControlBtnPanePosition() { @@ -665,6 +709,7 @@ public class DBManipulationPane extends BasicBeanPane { private void initJTableColumn() { TableColumn column0 = this.keyColumnValuesTable.getColumnModel().getColumn(0); column0.setMaxWidth(50); + column0.setCellRenderer(new BooleanRenderer()); TableColumn column1 = this.keyColumnValuesTable.getColumnModel().getColumn(1); column1.setCellRenderer(new ColumnNameTableCellRenderer()); @@ -674,6 +719,7 @@ public class DBManipulationPane extends BasicBeanPane { // 设置column1的editor columnsComboBox = new UIComboBox(new DefaultComboBoxModel()); + columnsComboBox.setRenderer(new UIComboBoxRenderer() { @Override @@ -982,7 +1028,7 @@ public class DBManipulationPane extends BasicBeanPane { } } - protected static class KeyColumnNameValueTable extends JTable { + protected static class KeyColumnNameValueTable extends FineUITable { public KeyColumnNameValueTable() { super(new KeyColumnValueTableModel(null)); @@ -1150,11 +1196,11 @@ public class DBManipulationPane extends BasicBeanPane { /* * ColumnNameTableCellRenderer */ - public static class ColumnNameTableCellRenderer extends DefaultTableCellRenderer { + public static class ColumnNameTableCellRenderer extends FineTableHeaderUI.TableRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); - + this.setHorizontalAlignment(SwingConstants.LEFT); if (value instanceof ColumnName) { this.setText(((ColumnName) value).name); } @@ -1166,10 +1212,11 @@ public class DBManipulationPane extends BasicBeanPane { /* * ColumnValueTableCellRenderer */ - private static class ColumnValueTableCellRenderer extends DefaultTableCellRenderer { + private static class ColumnValueTableCellRenderer extends FineTableHeaderUI.TableRenderer { @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + this.setHorizontalAlignment(SwingConstants.LEFT); if (value instanceof ColumnValue) { if (((ColumnValue) value).obj != null) { @@ -1186,4 +1233,25 @@ public class DBManipulationPane extends BasicBeanPane { return this; } } + + /** + * checkBox 的 cellRender + */ + public static class BooleanRenderer extends UICheckBox implements TableCellRenderer, UIResource { + public BooleanRenderer() { + super(); + setHorizontalAlignment(JLabel.CENTER); + setBorderPainted(true); + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + setSelected((value != null && ((Boolean) value).booleanValue())); + setUI(getUICheckBoxUI()); + setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor"))); + setBackground(Color.WHITE); + return this; + } + } } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java b/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java index d52eb4a653..e2ec70aa8d 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java @@ -1,6 +1,7 @@ package com.fr.design.write.submit; +import com.fine.theme.icon.LazyIcon; import com.fr.data.ClassSubmitJob; import com.fr.data.SubmitJob; import com.fr.design.gui.controlpane.NameObjectCreator; @@ -29,12 +30,12 @@ public class SubmitJobListPane extends ObjectJControlPane { return new NameableCreator[] { new NameObjectCreator( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Submit_Event"), - "/com/fr/web/images/reportlet.png", + new LazyIcon("dataLink"), DMLConfigJob.class, DMLJobPane.class), new NameObjectCreator( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Custom_Event"), - "/com/fr/web/images/reportlet.png", + new LazyIcon("dataLink"), ClassSubmitJob.class, CustomSubmitJobPane.class) }; diff --git a/designer-base/src/main/java/com/fr/env/EnvListPane.java b/designer-base/src/main/java/com/fr/env/EnvListPane.java index 454388e124..a9ccf08b8c 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -1,5 +1,6 @@ package com.fr.env; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.env.DesignerWorkspaceInfo; @@ -57,9 +58,9 @@ public class EnvListPane extends JListControlPane { */ @Override public NameableCreator[] createNameableCreators() { - NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", + NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_Workspace"), new LazyIcon("localConnect"), LocalDesignerWorkspaceInfo.class, LocalEnvPane.class); - NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png", + NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Remote_Server"), new LazyIcon("remoteConnect"), RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class); return new NameableCreator[]{local, remote}; } diff --git a/designer-base/src/main/java/com/fr/env/LocalEnvPane.java b/designer-base/src/main/java/com/fr/env/LocalEnvPane.java index 6f191dd1ec..a8f3e187ca 100644 --- a/designer-base/src/main/java/com/fr/env/LocalEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/LocalEnvPane.java @@ -1,23 +1,27 @@ package com.fr.env; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIStyle; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.border.FineBorderFactory; import com.fr.design.env.LocalDesignerWorkspaceInfo; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itree.filetree.JFileTree; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.file.filter.OnlyShowDirectoryFileFilter; import com.fr.stable.StringUtils; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; import java.awt.BorderLayout; import java.io.File; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; + /** * @author yaohwu */ @@ -27,46 +31,37 @@ public class LocalEnvPane extends BasicBeanPane { private JFileTree localEnvTree; public LocalEnvPane() { - this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - - // northPane - JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(northPane, BorderLayout.NORTH); + this.setLayout(new BorderLayout()); - northPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Location") + ":"), BorderLayout.WEST); pathTextField = new UITextField(); - northPane.add(pathTextField, BorderLayout.CENTER); - - // 删除选择文件按钮 添加JFileTree - - // centerPane - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.add(centerPane, BorderLayout.CENTER); - // 添加JFileTree localEnvTree = new JFileTree(); + FineUIStyle.setStyle(localEnvTree, FineUIStyle.PURE_TREE); JScrollPane localEnvPane = new JScrollPane(localEnvTree); - centerPane.add(localEnvPane, BorderLayout.CENTER); + JPanel centerPane = FineLayoutBuilder.asBorderLayoutWrapped(localEnvPane); // 设置根路径File 和 文件过滤类型 localEnvTree.setFileFilter(new OnlyShowDirectoryFileFilter()); localEnvTree.setRootFiles(File.listRoots()); - localEnvTree.addTreeSelectionListener(new TreeSelectionListener() { - - @Override - public void valueChanged(TreeSelectionEvent e) { - File selectFile = localEnvTree.getSelectedFile(); - if (selectFile == null) { - return; - } - pathTextField.setText(selectFile.getPath()); + localEnvTree.addTreeSelectionListener(e -> { + File selectFile = localEnvTree.getSelectedFile(); + if (selectFile == null) { + return; } + pathTextField.setText(selectFile.getPath()); }); UITextArea description = new UITextArea(); - centerPane.add(description, BorderLayout.SOUTH); description.setText(Toolkit.i18nText("Fine-Design_Basic_Env_Des1")); description.setEditable(false); + + this.add(column(10, + row(5, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Location") + ":")), cell(pathTextField).weight(1) + ), + cell(centerPane).with(it -> it.setBorder(FineBorderFactory.createWrappedRoundBorder())).weight(1), + cell(description).with(it -> it.setBorder(null)) + ).getComponent()); } @Override diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index 7be733b2b5..0dbc508ad6 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -1,9 +1,13 @@ package com.fr.env; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.border.UITitledBorder; import com.fr.design.env.RemoteDesignerWorkspaceInfo; import com.fr.design.env.processor.RemoteDesignerWorkspaceInfoProcessor; import com.fr.design.fun.DesignerEnvProcessor; @@ -22,7 +26,6 @@ import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.scrollruler.ModLineBorder; import com.fr.env.handler.WorkspaceExceptionHandler; import com.fr.stable.StringUtils; import com.fr.third.guava.base.Strings; @@ -30,7 +33,6 @@ import com.fr.workspace.WorkContext; import com.fr.workspace.connect.WorkspaceConnectionInfo; import javax.swing.BorderFactory; -import javax.swing.BoxLayout; import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JPanel; @@ -39,8 +41,6 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; import javax.swing.ToolTipManager; -import javax.swing.UIManager; -import javax.swing.border.EmptyBorder; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import java.awt.BorderLayout; @@ -76,6 +76,9 @@ public class RemoteEnvPane extends BasicBeanPane { private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); private UILabel uiLabel = new UILabel(); + private final int FIRST_COL_WIDTH = 80; + private final int SECOND_COL_WIDTH = 68; + /** * 是否启用 https 勾选框 @@ -251,50 +254,22 @@ public class RemoteEnvPane extends BasicBeanPane { public RemoteEnvPane() { // 配置内容面板 JPanel contentPanel = new JPanel(new BorderLayout()); - contentPanel.setBorder( - BorderFactory.createCompoundBorder( - new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Config"))) - ); - // 服务器地址地址 final JPanel configPanel = new JPanel(new BorderLayout()); - configPanel.setBorder( - BorderFactory.createCompoundBorder( - new EmptyBorder(15, 0, 0, 0), - BorderFactory.createTitledBorder( - new ModLineBorder(ModLineBorder.TOP), - Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Server") - ) - ) - ); - - - certPathLabel.setHorizontalAlignment(SwingConstants.RIGHT); - certSecretKeyLabel.setHorizontalAlignment(SwingConstants.RIGHT); + certPathLabel.setHorizontalAlignment(SwingConstants.LEFT); + certSecretKeyLabel.setHorizontalAlignment(SwingConstants.LEFT); packConfigPanel(configPanel); // 服务器账号配置 JPanel accountPanel = new JPanel(new BorderLayout()); - - - accountPanel.setBorder(BorderFactory.createCompoundBorder( - new EmptyBorder(15, 0, 0, 0), - BorderFactory.createTitledBorder( - new ModLineBorder(ModLineBorder.TOP), - Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Platform_Account") - ) - )); - + accountPanel.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); packAccountPanel(accountPanel); - // 测试链接按钮 JPanel testPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); testPanel.setBorder(BorderFactory.createEmptyBorder()); - testPanel.setPreferredSize(new Dimension(437, 20)); UIButton testConnectionButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Test_Connection")); testConnectionButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection")); @@ -306,14 +281,15 @@ public class RemoteEnvPane extends BasicBeanPane { }); testPanel.add(testConnectionButton); - contentPanel.add(configPanel, BorderLayout.NORTH); contentPanel.add(accountPanel, BorderLayout.CENTER); - contentPanel.add(packRememberPwdConfigPanel(), BorderLayout.SOUTH); + UILabel label = new UILabel(); + FineUIUtils.wrapBoldLabelWithUnderline(label); + contentPanel.add(label, BorderLayout.SOUTH); JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - panel.add(contentPanel, BorderLayout.NORTH); + panel.add(FineUIUtils.wrapComponentWithTitle(contentPanel, Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Config")), BorderLayout.NORTH); panel.add(testPanel, BorderLayout.CENTER); - panel.setPreferredSize(new Dimension(440, 600)); + panel.setPreferredSize(new Dimension(FineUIScale.scale(440), (int) panel.getPreferredSize().getHeight())); UIScrollPane scrollPane = new UIScrollPane(panel); this.setLayout(new BorderLayout()); this.add(scrollPane); @@ -395,43 +371,42 @@ public class RemoteEnvPane extends BasicBeanPane { private void packConfigPanel(JPanel configPanel) { - - // 主机名 UILabel hostNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Host_IP")); - hostNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); + hostNameLabel.setHorizontalAlignment(SwingConstants.LEFT); // 端口 UILabel portLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Port")); - portLabel.setHorizontalAlignment(SwingConstants.RIGHT); + portLabel.setHorizontalAlignment(SwingConstants.LEFT); // web应用 UILabel webAppNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Web_Name")); - webAppNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); + webAppNameLabel.setHorizontalAlignment(SwingConstants.LEFT); // servlet UILabel servletNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Servlet_Name")); - servletNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); + servletNameLabel.setHorizontalAlignment(SwingConstants.LEFT); // 主机位置 UILabel remoteEnvURLLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_URL")); - remoteEnvURLLabel.setHorizontalAlignment(SwingConstants.RIGHT); + remoteEnvURLLabel.setHorizontalAlignment(SwingConstants.LEFT); + + //远程服务器 + UILabel remoteServerLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Server")); + remoteServerLabel.setHorizontalAlignment(SwingConstants.LEFT); enableSubDocListener(); JPanel urlPanel = TableLayoutHelper.createGapTableLayoutPane( new Component[][]{ - new Component[]{hostNameLabel, hostNameInput}, - new Component[]{portLabel, portInput}, - new Component[]{webAppNameLabel, webAppNameInput}, - new Component[]{servletNameLabel, servletNameInput}, - new Component[]{remoteEnvURLLabel, remoteEnvURLInput} + new Component[]{remoteServerLabel, hostNameLabel, hostNameInput}, + new Component[]{new UILabel(), portLabel, portInput}, + new Component[]{new UILabel(), webAppNameLabel, webAppNameInput}, + new Component[]{new UILabel(), servletNameLabel, servletNameInput}, + new Component[]{new UILabel(), remoteEnvURLLabel, remoteEnvURLInput} }, new double[]{PREFERRED, PREFERRED, PREFERRED, PREFERRED, PREFERRED}, - new double[]{PREFERRED, FILL}, - 5, + new double[]{FIRST_COL_WIDTH, SECOND_COL_WIDTH, FILL}, + 14, 10 - ); - TableLayoutHelper.modifyTableLayoutIndexVGap(urlPanel, 0, 10); - JTextPane urlTipsPane = new JTextPane(); urlTipsPane.setEditable(false); urlTipsPane.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Server_Config_Tips")); @@ -482,7 +457,6 @@ public class RemoteEnvPane extends BasicBeanPane { private void packHttpsConfigPanel() { - double[] rows = new double[]{PREFERRED}; boolean httpsEnabled = httpsCheckbox.isSelected(); @@ -491,13 +465,13 @@ public class RemoteEnvPane extends BasicBeanPane { } JPanel content = TableLayoutHelper.createGapTableLayoutPane( new Component[][]{ - new Component[]{httpsCheckbox, new JPanel()}, - new Component[]{certPathLabel, httpsCertFileInputPanel}, - new Component[]{certSecretKeyLabel, certSecretKeyInput} + new Component[]{httpsCheckbox, new JPanel(), new UILabel()}, + new Component[]{new UILabel(), certPathLabel, httpsCertFileInputPanel}, + new Component[]{new UILabel(), certSecretKeyLabel, certSecretKeyInput} }, rows, - new double[]{PREFERRED, FILL}, - 5, + new double[]{FIRST_COL_WIDTH, SECOND_COL_WIDTH, FILL}, + 14, 10 ); httpsConfigPanel.add(content, BorderLayout.CENTER); @@ -508,10 +482,13 @@ public class RemoteEnvPane extends BasicBeanPane { // 用户名 UILabel userNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Account_Username")); - userNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); + userNameLabel.setHorizontalAlignment(SwingConstants.LEFT); // 密码 UILabel passwordLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Account_Password")); - passwordLabel.setHorizontalAlignment(SwingConstants.RIGHT); + passwordLabel.setHorizontalAlignment(SwingConstants.LEFT); + + UILabel accountLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Platform_Account")); + accountLabel.setHorizontalAlignment(SwingConstants.LEFT); //输入密码的时候检测下大写锁定 passwordInput.addMouseListener(new MouseAdapter() { @@ -527,42 +504,25 @@ public class RemoteEnvPane extends BasicBeanPane { }); Component[][] accountComponents = new Component[][]{ - new Component[]{userNameLabel, usernameInput}, - new Component[]{passwordLabel, passwordInput} + new Component[]{accountLabel, userNameLabel, usernameInput}, + new Component[]{new UILabel(), passwordLabel, passwordInput}, + new Component[]{new UILabel(), new UILabel(), rememberPwdCheckbox} }; JPanel content = TableLayoutHelper.createGapTableLayoutPane(accountComponents, - new double[]{PREFERRED, PREFERRED}, - new double[]{PREFERRED, FILL}, - 5, + new double[]{PREFERRED, PREFERRED, PREFERRED}, + new double[]{FIRST_COL_WIDTH, SECOND_COL_WIDTH, FILL}, + 14, 10 ); - TableLayoutHelper.modifyTableLayoutIndexVGap(content, 0, 10); - accountPanel.add(content, BorderLayout.CENTER); } - private JPanel packRememberPwdConfigPanel() { - - JPanel panel = TableLayoutHelper.createGapTableLayoutPane( - new Component[][]{ - new Component[]{rememberPwdCheckbox} - }, - new double[]{PREFERRED}, - new double[]{PREFERRED}, - 5, - 10 - ); - TableLayoutHelper.modifyTableLayoutIndexHGap(panel, 0, 50); - return panel; - } - private JPanel createHttpsCertFileInputPanel() { JPanel inputPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); inputPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); inputPanel.add(certPathInput, BorderLayout.CENTER); inputPanel.add(fileChooserButton, BorderLayout.EAST); - fileChooserButton.setPreferredSize(new Dimension(20, 20)); fileChooserButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent evt) { @@ -601,15 +561,12 @@ public class RemoteEnvPane extends BasicBeanPane { try { if (get()) { message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Successful")); - uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); + uiLabel.setIcon(new LazyIcon("information", 20)); } } catch (Exception e) { dialog.dispose(); WorkspaceExceptionHandler.getInstance().handleInTest(e, remoteEnv); } - dialogDownPane.remove(cancelButton); - dialogDownPane.revalidate(); - dialogDownPane.repaint(); } }; worker.execute(); @@ -641,26 +598,24 @@ public class RemoteEnvPane extends BasicBeanPane { private void initMessageDialog() { message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Try") + "..."); - message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); okButton.setEnabled(false); dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Fine-Design_Basic_Dialog_Message_Title"), true); - dialog.setSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.env.RemoteEnvPane.dialog")); + dialog.setSize(FineUIScale.scale(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.env.RemoteEnvPane.dialog"))); okButton.setEnabled(false); JPanel jp = new JPanel(); - JPanel upPane = new JPanel(); + JPanel upPane = new JPanel(new BorderLayout()); dialogDownPane = new JPanel(); - uiLabel = new UILabel(UIManager.getIcon("OptionPane.informationIcon")); - upPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 10)); - upPane.add(uiLabel); - upPane.add(message); - dialogDownPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0)); + uiLabel = new UILabel(new LazyIcon("information", 20)); + upPane.add(Layouts.row(10, Layouts.cell(uiLabel), Layouts.cell(message), Layouts.flex()).getComponent(), BorderLayout.NORTH); + dialogDownPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 8, 0)); dialogDownPane.add(okButton); dialogDownPane.add(cancelButton); - jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS)); - jp.add(upPane); - jp.add(dialogDownPane); + jp.setLayout(new BorderLayout()); + jp.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); + jp.add(upPane, BorderLayout.CENTER); + jp.add(dialogDownPane, BorderLayout.SOUTH); dialog.add(jp); dialog.setResizable(false); dialog.setLocationRelativeTo(SwingUtilities.getWindowAncestor(RemoteEnvPane.this)); diff --git a/designer-base/src/main/java/com/fr/env/TestConnectionResult.java b/designer-base/src/main/java/com/fr/env/TestConnectionResult.java index 7c8788941d..8fe4aff863 100644 --- a/designer-base/src/main/java/com/fr/env/TestConnectionResult.java +++ b/designer-base/src/main/java/com/fr/env/TestConnectionResult.java @@ -1,5 +1,9 @@ package com.fr.env; +import com.fine.theme.icon.LazyIcon; +import com.fr.decision.webservice.exception.login.UserLoginLockException; +import com.fr.decision.webservice.exception.login.UserPasswordNeedUpdateException; +import com.fr.decision.webservice.exception.user.UserPasswordStrengthLimitException; import com.fr.design.i18n.Toolkit; import com.fr.exception.RemoteDesignPermissionDeniedException; import com.fr.general.ComparatorUtils; @@ -8,7 +12,6 @@ import com.fr.workspace.connect.WorkspaceConnectionInfo; import com.fr.workspace.engine.exception.WorkspaceCheckException; import javax.swing.Icon; -import javax.swing.UIManager; /** * 测试连接的结果。 @@ -24,7 +27,7 @@ public enum TestConnectionResult { FULLY_SUCCESS { @Override public Icon getIcon() { - return UIManager.getIcon("OptionPane.informationIcon"); + return new LazyIcon("information", 20); } @Override @@ -39,7 +42,7 @@ public enum TestConnectionResult { PARTLY_SUCCESS { @Override public Icon getIcon() { - return UIManager.getIcon("OptionPane.warningIcon"); + return new LazyIcon("warning", 20); } @Override @@ -54,7 +57,7 @@ public enum TestConnectionResult { FULLY_FAILED { @Override public Icon getIcon() { - return UIManager.getIcon("OptionPane.errorIcon"); + return new LazyIcon("error", 20); } @Override @@ -69,7 +72,7 @@ public enum TestConnectionResult { AUTH_FAILED { @Override public Icon getIcon() { - return UIManager.getIcon("OptionPane.errorIcon"); + return new LazyIcon("error", 20); } @Override @@ -87,7 +90,7 @@ public enum TestConnectionResult { @Override public Icon getIcon() { - return UIManager.getIcon("OptionPane.errorIcon"); + return new LazyIcon("error", 20); } @Override @@ -117,7 +120,7 @@ public enum TestConnectionResult { PERMISSION_DENIED { @Override public Icon getIcon() { - return UIManager.getIcon("OptionPane.errorIcon"); + return new LazyIcon("error", 20); } @Override @@ -137,7 +140,7 @@ public enum TestConnectionResult { PASSWORD_STRENGTH_LIMIT () { @Override public Icon getIcon() { - return UIManager.getIcon("OptionPane.errorIcon"); + return new LazyIcon("error", 20); } @Override @@ -162,7 +165,7 @@ public enum TestConnectionResult { PASSWORD_NEED_UPDATE { @Override public Icon getIcon() { - return UIManager.getIcon("OptionPane.errorIcon"); + return new LazyIcon("error", 20); } @Override diff --git a/designer-base/src/main/java/com/fr/env/VersionCheckMessageDialog.java b/designer-base/src/main/java/com/fr/env/VersionCheckMessageDialog.java index 5fd4c9ec09..f12461888a 100644 --- a/designer-base/src/main/java/com/fr/env/VersionCheckMessageDialog.java +++ b/designer-base/src/main/java/com/fr/env/VersionCheckMessageDialog.java @@ -1,5 +1,8 @@ package com.fr.env; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.versioncheck.VersionCheckUtils; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; @@ -46,7 +49,7 @@ public class VersionCheckMessageDialog extends JDialog implements ActionListener private void init(String message) { JPanel imagePanel = new JPanel(); - imageLabel = new UILabel(IOUtils.readIcon("com/fr/design/images/warnings/warning32.png")); + imageLabel = new UILabel(new LazyIcon("warning")); imagePanel.add(imageLabel); JPanel messagePanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true); UILabel messageText = new UILabel(); @@ -54,7 +57,7 @@ public class VersionCheckMessageDialog extends JDialog implements ActionListener messagePanel.add(messageText); centerPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - centerPanel.setBorder(BorderFactory.createEmptyBorder(15, 10, 10, 10)); + centerPanel.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); centerPanel.add(imagePanel, BorderLayout.WEST); centerPanel.add(messagePanel, BorderLayout.CENTER); @@ -90,7 +93,7 @@ public class VersionCheckMessageDialog extends JDialog implements ActionListener this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Sync_Prompt")); this.setResizable(false); this.add(body, BorderLayout.NORTH); - this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US) ? 300 : 280, 135)); + this.setSize(FineUIScale.scale(new Dimension(GeneralContext.getLocale().equals(Locale.US) ? 300 : 280, 135))); GUICoreUtils.centerWindow(this); } diff --git a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorAction.java b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorAction.java index 42ab6306ac..9052e99ae8 100644 --- a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorAction.java +++ b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorAction.java @@ -1,5 +1,6 @@ package com.fr.env.detect.ui; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; @@ -16,7 +17,7 @@ public class EnvDetectorAction extends UpdateAction { public EnvDetectorAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Carton_Toolbox_Title")); - this.setSmallIcon("com/fr/env/detect/detect_normal.svg"); + this.setSmallIcon(new LazyIcon("envDetect")); } @Override diff --git a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java index ebd9ba460a..993bf41d8a 100644 --- a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java +++ b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java @@ -1,14 +1,15 @@ package com.fr.env.detect.ui; +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.svg.IconUtils; import com.fr.design.components.notification.NotificationDialog; import com.fr.design.components.notification.NotificationDialogProperties; import com.fr.design.components.notification.NotificationModel; import com.fr.design.components.table.TablePanel; -import com.fr.design.constants.DesignerColor; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.ibutton.UIButtonUI; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; @@ -16,7 +17,6 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.ui.util.UIUtil; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.design.utils.gui.GUIPaintUtils; import com.fr.env.detect.base.DetectorBridge; import com.fr.env.detect.base.DetectorUtil; import com.fr.env.detect.base.EnvDetectorConfig; @@ -32,18 +32,15 @@ import javax.swing.ImageIcon; import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.SwingWorker; -import javax.swing.plaf.ButtonUI; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Frame; -import java.awt.Graphics2D; import java.awt.Image; import java.awt.Cursor; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.io.File; import java.net.URL; import java.util.List; import java.util.Map; @@ -59,6 +56,7 @@ public class EnvDetectorDialog extends JDialog { private static final ImageIcon LOADING_ICON = getLoadingIcon(); private static final int TIMEOUT = 1000; + private static final int HORIZONTAL_GAP = 8; private static final Color SUCCESS_COLOR = new Color(22, 193, 83); private static final Color DETAIL_FONT_COLOR = new Color(65, 155, 249); @@ -120,6 +118,7 @@ public class EnvDetectorDialog extends JDialog { /* tailPanel*/ this.tailPanel = createTailPanel(); body.add(tailPanel, BorderLayout.SOUTH); + body.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); add(body); @@ -138,29 +137,9 @@ public class EnvDetectorDialog extends JDialog { private JPanel createHeaderPanel() { JPanel headerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - headerPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 12, 0)); - this.detectButton = new UIButton(buttonStatus.getDesc()) { - @Override - public ButtonUI getUI() { - - return new UIButtonUI() { - @Override - protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) { - if (isPressed(b) && b.isPressedPainted()) { - GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), - DesignerColor.Button.Primary.PRESSED); - } else if (isRollOver(b)) { - GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), - DesignerColor.Button.Primary.HOVER); - } else if (b.isNormalPainted()) { - GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), - DesignerColor.Button.Primary.NORMAL); - } - } - }; - } - }; - detectButton.setForeground(Color.WHITE); + headerPanel.setBorder(new ScaledEmptyBorder(0, 0, 10, 0)); + this.detectButton = new UIButton(buttonStatus.getDesc()); + FineUIStyle.setStyle(detectButton, FineUIStyle.STYLE_PRIMARY); detectButton.setToolTipText(buttonStatus.getDesc()); detectButton.addActionListener(event -> { if (buttonStatus.isNotExecuting()) { @@ -169,9 +148,6 @@ public class EnvDetectorDialog extends JDialog { stopDetecting(detectButton); } }); - detectButton.setPreferredSize(new Dimension(68, 20)); - detectButton.setBorderPainted(false); - detectButton.setContentAreaFilled(false); headerPanel.add(detectButton, BorderLayout.WEST); UILabel openUtilBoxLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Carton_Feedback_ToolBox")); @@ -434,7 +410,7 @@ public class EnvDetectorDialog extends JDialog { private JPanel createTailPanel() { JPanel tailPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - tailPanel.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0)); + tailPanel.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); JPanel configPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); { @@ -450,25 +426,23 @@ public class EnvDetectorDialog extends JDialog { } tailPanel.add(configPanel, BorderLayout.WEST); - JPanel actionsPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - actionsPanel.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - { - UIButton confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Confirm")); - confirmButton.addActionListener((e) -> { - setVisible(false); - dispose(); - // 配置处理 - EnvDetectorConfig.getInstance().setEnabled(this.detectOpen); - }); - actionsPanel.add(confirmButton, BorderLayout.WEST); + JPanel actionsPanel = Layouts.row(HORIZONTAL_GAP).getComponent(); - UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); - cancelButton.addActionListener((e) -> { - setVisible(false); - dispose(); - }); - actionsPanel.add(cancelButton, BorderLayout.EAST); - } + UIButton confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Confirm")); + confirmButton.addActionListener((e) -> { + setVisible(false); + dispose(); + // 配置处理 + EnvDetectorConfig.getInstance().setEnabled(this.detectOpen); + }); + actionsPanel.add(confirmButton); + + UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); + cancelButton.addActionListener((e) -> { + setVisible(false); + dispose(); + }); + actionsPanel.add(cancelButton); tailPanel.add(actionsPanel, BorderLayout.EAST); return tailPanel; } diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java index 8bc913d8cc..79b8033c42 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java @@ -1,12 +1,19 @@ package com.fr.file; import com.fr.workspace.server.repository.system.WorkspaceSystemInfo; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineComponentsFactory; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.extension.FileExtension; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.UpdateAction; +import com.fr.design.border.FineBorderFactory; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.dialog.UIDialog; @@ -25,8 +32,6 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itree.filetree.FileTreeIcon; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.mainframe.DesignerFrameFileDealerPane; import com.fr.design.mainframe.JTemplate; @@ -80,12 +85,10 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.filechooser.FileSystemView; import javax.swing.plaf.basic.BasicArrowButton; -import javax.swing.plaf.basic.BasicButtonUI; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Insets; import java.awt.Window; import java.awt.event.ActionEvent; @@ -107,6 +110,11 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineUIScale.scale; import static javax.swing.JOptionPane.DEFAULT_OPTION; import static javax.swing.JOptionPane.WARNING_MESSAGE; @@ -306,12 +314,10 @@ public class FILEChooserPane extends BasicPane { locationPane.add(mkdirButton, BorderLayout.EAST); JPanel centerLeftPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - // centerLeftPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); // Richie:placesList includes C,D,E,F and DeskTop etc. placesList = new JList(); + FineUIStyle.setStyle(placesList, FineUIStyle.PURE_LIST); centerLeftPanel.add(placesList, BorderLayout.CENTER); - centerLeftPanel.setBorder(BorderFactory.createLineBorder(Color.GRAY)); - centerLeftPanel.setPreferredSize(new Dimension(120, 1)); placesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); placesList.setCellRenderer(new DefaultListCellRenderer() { @@ -361,12 +367,10 @@ public class FILEChooserPane extends BasicPane { } }); - // centerRightPane - JPanel centerRightPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - JPanel subFilePanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); // 以后rightPanel要用JTable subFileList = new JList(new DefaultListModel<>()); + FineUIStyle.setStyle(subFileList, FineUIStyle.PURE_LIST); /* * JList的CellRenderer */ @@ -458,27 +462,45 @@ public class FILEChooserPane extends BasicPane { }); scrollPane = new JScrollPane(subFileList); subFilePanel.add(scrollPane, BorderLayout.CENTER); - centerRightPane.add(subFilePanel, BorderLayout.CENTER); + subFilePanel.setBorder(FineBorderFactory.createWrappedRoundBorder()); // 用createTableLayoutPane布局下fileNamePane - UIButton cancelButton; - Component[][] coms = new Component[][]{ - new Component[]{GUICoreUtils.createBorderPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Utils_File_Name") + ":"), BorderLayout.WEST), - fileNameTextField = new UIAutoCompletionField(), okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Utils_Design_File_Open")) - }, - new Component[]{GUICoreUtils.createBorderPane(new UILabel(Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"), BorderLayout.WEST), - postfixComboBox = new UIComboBox(), cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Utils_Design_Action_Cancel")) - }}; - - JPanel fileNamePane = TableLayoutHelper.createGapTableLayoutPane(coms, new double[]{TableLayout.PREFERRED, TableLayout.PREFERRED, - TableLayout.PREFERRED}, new double[]{TableLayout.PREFERRED, TableLayout.FILL, TableLayout.PREFERRED}, 24, 4); - centerRightPane.add(fileNamePane, BorderLayout.SOUTH); - - Component[][] outComponents = new Component[][]{ - new Component[]{GUICoreUtils.createBorderPane(new UILabel(Toolkit.i18nText("Fine-Design_Basic_App_File_Lookup_range") + ":"), BorderLayout.WEST), locationPane}, - new Component[]{centerLeftPanel, centerRightPane}}; - JPanel contentPane = TableLayoutHelper.createTableLayoutPane(outComponents, new double[]{TableLayout.PREFERRED, TableLayout.FILL}, - new double[]{TableLayout.PREFERRED, TableLayout.FILL}); + fileNameTextField = new UIAutoCompletionField(); + postfixComboBox = new UIComboBox(); + okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Utils_Design_File_Open")); + UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Utils_Design_Action_Cancel")); + + JPanel fileNamePane = column(10, + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Utils_File_Name"))).weight(1), + cell(fileNameTextField).weight(5) + ), + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_Utils_File_Type"))).weight(1), + cell(postfixComboBox).weight(5) + ) + ).getComponent(); + JPanel centerRightPane = column(10, + cell(subFilePanel).weight(1), + cell(fileNamePane) + ).getComponent(); + JPanel contentPane = column(10, + row(10, + column(10, + cell(new UILabel(Toolkit.i18nText("Fine-Design_Basic_App_File_Lookup_range"))) + .with(it -> FineUIStyle.setStyle(it, FineUIStyle.LABEL_BOLD)), + cell(centerLeftPanel).with(it -> it.setBorder(FineBorderFactory.createWrappedRoundBorder())).weight(1) + ).weight(1), + column(10, + cell(locationPane), + cell(centerRightPane).weight(1) + ).weight(3) + ).weight(1), + row(8, + flex(), cell(cancelButton), cell(okButton).with(it -> FineUIStyle.setStyle(it, FineUIStyle.STYLE_PRIMARY)) + ) + ).getComponent(); + this.add(contentPane, BorderLayout.CENTER); okButton.addActionListener(new ActionListener() { @Override @@ -1264,7 +1286,7 @@ public class FILEChooserPane extends BasicPane { @Override public Icon getIcon() { - return BaseUtils.readIcon("/com/fr/base/images/oem/logo.png"); + return new LazyIcon("logo"); } } } @@ -1384,7 +1406,7 @@ public class FILEChooserPane extends BasicPane { @Override public Icon getIcon() { if (ComparatorUtils.equals(getTotalName(), ProjectConstants.REPORTLETS_NAME)) { - return BaseUtils.readIcon("/com/fr/base/images/oem/logo.png"); + return new LazyIcon("logo"); } else { return FileTreeIcon.getIcon(new File(this.getPath()), false); } @@ -1481,7 +1503,7 @@ public class FILEChooserPane extends BasicPane { dirPath = dirPath + SEPARATOR_STRING; } if (ComparatorUtils.equals(actionPath, dirPath)) { - this.buttonList.get(i).setForeground(Color.BLUE); + this.buttonList.get(i).setForeground(FlatUIUtils.getUIColor("brand.normal", Color.BLUE)); } } } @@ -1683,42 +1705,30 @@ public class FILEChooserPane extends BasicPane { private UIButton createBlankButton(SetDirectoryAction setDirectoryAction) { - final Color brighter = this.getBackground().brighter(); - final Color darker = this.getBackground().darker(); - final UIButton blankButton = new UIButton(setDirectoryAction); blankButton.setMargin(new Insets(0, 0, 0, 0)); - blankButton.setUI(new BasicButtonUI()); blankButton.setHorizontalTextPosition(SwingConstants.CENTER); blankButton.setBorderPainted(false); blankButton.setBorder(BorderFactory.createRaisedBevelBorder()); - blankButton.setBackground(darker); + blankButton.setBackground(null); blankButton.addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - blankButton.setBackground(brighter); - blankButton.setBorderPainted(true); blankButton.repaint(); } @Override public void mouseExited(MouseEvent e) { - blankButton.setBackground(darker); - blankButton.setBorderPainted(false); blankButton.repaint(); } @Override public void mousePressed(MouseEvent e) { - blankButton.setBackground(brighter); - blankButton.setBorderPainted(false); blankButton.repaint(); } @Override public void mouseReleased(MouseEvent e) { - blankButton.setBackground(darker); - blankButton.setBorderPainted(true); blankButton.repaint(); } @@ -1732,7 +1742,7 @@ public class FILEChooserPane extends BasicPane { */ private UIButton initMkdirButton() { UIButton folderButton = new UIButton(); - folderButton.setIcon(BaseUtils.readIcon("com/fr/design/images/icon_NewFolderIcon_normal.png")); + folderButton.setIcon(new LazyIcon("new_folder")); folderButton.setUI(new UIButtonUI()); folderButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Utils_New_Folder")); folderButton.addActionListener(new ActionListener() { @@ -1781,10 +1791,6 @@ public class FILEChooserPane extends BasicPane { UILabel newNameLabel = new UILabel(Toolkit.i18nText( "Fine-Design_Basic_Enter_New_Folder_Name") ); - newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); - newNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10)); - newNameLabel.setPreferredSize(new Dimension(118, 15)); - // 文件名输入框 nameField = new UITextField(); nameField.getDocument().addDocumentListener(new DocumentListener() { @@ -1802,12 +1808,9 @@ public class FILEChooserPane extends BasicPane { } }); nameField.selectAll(); - nameField.setPreferredSize(new Dimension(180, 20)); - - JPanel topPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 5)); - topPanel.setBorder(BorderFactory.createEmptyBorder(15, 15, 0, 15)); - topPanel.add(newNameLabel); - topPanel.add(nameField); + JPanel topPanel = FineLayoutBuilder.createHorizontalLayout(10, new double[]{1,1}, + newNameLabel, nameField + ); // 增加enter以及esc快捷键的支持 nameField.addKeyListener(new KeyAdapter() { @@ -1824,54 +1827,32 @@ public class FILEChooserPane extends BasicPane { }); // 重名提示 warnLabel = new UILabel(); - warnLabel.setPreferredSize(new Dimension(300, 30)); - warnLabel.setHorizontalAlignment(SwingConstants.LEFT); - warnLabel.setForeground(Color.RED); + FineUIStyle.setStyle(warnLabel, FineUIStyle.LABEL_WARNING_TIP); warnLabel.setVisible(false); JPanel midPanel = new JPanel(new BorderLayout()); - midPanel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 15)); midPanel.add(warnLabel, BorderLayout.WEST); // 确认按钮 confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Confirm")); - confirmButton.setPreferredSize(new Dimension(60, 25)); - confirmButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - confirmClose(); - } - }); + confirmButton.addActionListener(e -> confirmClose()); // 取消按钮 UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); - cancelButton.setPreferredSize(new Dimension(60, 25)); - cancelButton.addActionListener(new ActionListener() { + cancelButton.addActionListener(e -> dispose()); - public void actionPerformed(ActionEvent e) { - dispose(); - } - }); - JPanel bottomPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - bottomPanel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 15)); - bottomPanel.add(confirmButton); - bottomPanel.add(cancelButton); - - this.add( - TableLayoutHelper.createTableLayoutPane( - new Component[][]{ - new Component[]{topPanel}, - new Component[]{midPanel}, - new Component[]{bottomPanel} - }, - new double[]{TableLayout.FILL, TableLayout.FILL, TableLayout.FILL}, - new double[]{TableLayout.FILL} - ), - BorderLayout.CENTER); - - - this.setSize(340, 180); + JPanel bottomPanel = FineComponentsFactory.createConfirmCancelButtonPane(confirmButton, cancelButton); + + JPanel panel = new JPanel(new BorderLayout(0, scale(10))); + panel.add(topPanel, BorderLayout.NORTH); + panel.add(midPanel, BorderLayout.CENTER); + panel.add(bottomPanel, BorderLayout.SOUTH); + panel.setBorder(new ScaledEmptyBorder(20, 10, 20, 10)); + this.add(panel, BorderLayout.CENTER); + + this.setSize(scale(new Dimension(360, 180))); this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Mkdir")); this.setResizable(false); this.setAlwaysOnTop(true); diff --git a/designer-base/src/main/java/com/fr/file/FileFILE.java b/designer-base/src/main/java/com/fr/file/FileFILE.java index fca6835bff..85713f92a1 100644 --- a/designer-base/src/main/java/com/fr/file/FileFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileFILE.java @@ -73,9 +73,8 @@ public class FileFILE implements FILE { if (file == null) { return FileTreeIcon.BLANK_IMAGE_ICON; } - FileSystemView view = FileSystemView.getFileSystemView(); try { - return view.getSystemIcon(file); + return FileTreeIcon.getIcon(file); } catch (Exception e) { /* * alex:在显示Mac里面某个目录的时候,居然会抛 diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java index 438e9c6b17..8d3a7068b7 100644 --- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java @@ -1,7 +1,7 @@ package com.fr.file; +import com.fine.theme.icon.LazyIcon; import com.fr.base.FRContext; -import com.fr.base.svg.IconUtils; import com.fr.design.file.TemplateResourceManager; import com.fr.io.FineEncryptUtils; import com.fr.base.io.XMLEncryptUtils; @@ -171,7 +171,7 @@ public class FileNodeFILE implements FILE { } if (ComparatorUtils.equals(node.getEnvPath(), ProjectConstants.REPORTLETS_NAME)) { - return IconUtils.readIcon("/com/fr/base/images/oem/logo.svg"); + return new LazyIcon("logo"); } else { if (!hasFullAuth) { diff --git a/designer-base/src/main/java/com/fr/start/BaseDesigner.java b/designer-base/src/main/java/com/fr/start/BaseDesigner.java index 44228c2a4a..0391b4dabc 100644 --- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java +++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java @@ -147,47 +147,47 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } } } - + @Nullable private FILE getLastOpenFile() { - + FILE file = DesignerStartupContext.getInstance().getStartingTemplateFile(); if (file == null) { file = FILEFactory.createFILE(FILEFactory.ENV_PREFIX + DesignerEnvManager.getEnvManager().getLastOpenFile()); } return file; } - + private boolean openFile(final DesignerFrame df, boolean isException, FILE file) { - + AtomicBoolean isExWrapper = new AtomicBoolean(isException); openTemplate(df, isExWrapper, file); - + if (OperatingSystem.isMacOS()) { enableFullScreenMode(df); } - + JTemplate selectedJTemplate = df.getSelectedJTemplate(); if (selectedJTemplate != null) { selectedJTemplate.requestGridFocus(); } return isExWrapper.get(); } - + private void openTemplate(DesignerFrame df, AtomicBoolean isException, FILE file) { - + // 如果是起始页启动中 if (openTemplateOnStartup(df, isException, file)) { return; } - + openTemplate0(df, isException, file); } - + private void openTemplate0(DesignerFrame df, AtomicBoolean isException, FILE file) { - + file = getExtraFILE(isException, file); - + if (file != null && file.exists() && !isException.get()) { df.openTemplate(file); } else { @@ -196,9 +196,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock { MultiTemplateTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); } } - + private FILE getExtraFILE(AtomicBoolean isException, FILE file) { - + //启动时打开指定文件的接口 DesignerStartOpenFileProcessor processor = ExtraDesignClassManager.getInstance().getSingle(DesignerStartOpenFileProcessor.XML_TAG); // 如果插件没有，且又开启了启动时打开空文件，则使用启动时打开空文件 @@ -216,9 +216,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } return file; } - + private boolean openTemplateOnStartup(DesignerFrame df, AtomicBoolean isException, FILE file) { - + boolean onStartup = DesignerStartupContext.getInstance().isSupport(); if (onStartup) { DesignerStartupContext context = DesignerStartupContext.getInstance(); @@ -234,29 +234,30 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } return false; } - + private boolean isOpenTemplate(AtomicBoolean isException, FILE file, DesignerStartupContext context) { - + return context.isOpenLastFile() && file != null && file.exists() && !isException.get(); } - + private boolean openEmpty(DesignerFrame df) { df.showEmptyJTemplate(); return true; } - + private boolean openTemplate(DesignerFrame df, FILE file) { df.openTemplate(file); return true; } - + private boolean createNewTemplate(DesignerFrame df) { df.addAndActivateJTemplate(); // 如果没有模板，则需要确认一下 - MultiTemplateTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); + MultiTemplateTabPane.getInstance() + .setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); return true; } - + private void enableFullScreenMode(Window window) { String className = "com.apple.eawt.FullScreenUtilities"; String methodName = "setWindowCanFullScreen"; diff --git a/designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java b/designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java index b42cc4ed8f..9ef7a9c1ef 100644 --- a/designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java +++ b/designer-base/src/main/java/com/fr/start/common/DesignerOpenEmptyPanel.java @@ -1,36 +1,32 @@ package com.fr.start.common; +import com.fine.theme.utils.FineUIStyle; import com.fr.base.svg.IconUtils; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.MultiTemplateTabPane; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; -import com.fr.design.utils.ColorUtils; import javax.swing.JButton; import javax.swing.JPanel; -import javax.swing.border.EmptyBorder; import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineUIStyle.setStyle; + /** * created by Harrison on 2022/07/09 **/ public class DesignerOpenEmptyPanel extends JPanel { - private static final Color BUTTON_COLOR = new Color(63, 155, 249); - private static final int ARC = 4; - private final JPanel body; public DesignerOpenEmptyPanel() { @@ -38,20 +34,8 @@ public class DesignerOpenEmptyPanel extends JPanel { this.body = FRGUIPaneFactory.createBorderLayout_S_Pane(); UILabel createIcon = new UILabel(IconUtils.readIcon("/com/fr/design/startup/create_new_template.svg")); - JButton createButton = new JButton(Toolkit.i18nText("Fine-Design_New_Template")) { - @Override - public void paintComponent(Graphics g) { - Graphics2D g2d = (Graphics2D) g; - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(BUTTON_COLOR); - g2d.fillRoundRect(0, 0, getWidth(), getHeight(), ARC, ARC); - super.paintComponent(g2d); - } - }; - createButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.start.common.DesignerOpenEmptyPanel.createButton")); - createButton.setForeground(Color.WHITE); - createButton.setBorderPainted(false); - createButton.setContentAreaFilled(false); + JButton createButton = new JButton(Toolkit.i18nText("Fine-Design_New_Template")); + setStyle(createButton, FineUIStyle.STYLE_PRIMARY); createButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -62,18 +46,14 @@ public class DesignerOpenEmptyPanel extends JPanel { MultiTemplateTabPane.getInstance().setTemTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); } }); - createButton.setBorder(new EmptyBorder(0, 10, 0, 10)); - JPanel createButtonPanel = new JPanel(FRGUIPaneFactory.createCenterFlowLayout()); - createButtonPanel.add(createButton); - createButtonPanel.setBorder(new EmptyBorder(0, 0, 0, 0)); - createButtonPanel.setBackground(Color.WHITE); this.body.add(createIcon, BorderLayout.NORTH); - this.body.add(createButtonPanel, BorderLayout.SOUTH); + this.body.add(row( + flex(),cell(createButton),flex() + ).getComponent(), BorderLayout.SOUTH); setLayout(FRGUIPaneFactory.createCenterLayout(this.body, 0.4d, 0.4d)); - - ColorUtils.syncBackground(this, Color.WHITE); - + setStyle(this.body, FineUIStyle.NORMAL_COLOR); + setStyle(this, FineUIStyle.NORMAL_COLOR); add(this.body); } } diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java index f8f7a13ea2..c20aaa153d 100644 --- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java +++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java @@ -5,12 +5,12 @@ import com.fr.design.gui.iprogressbar.ProgressDialog; import com.fr.design.i18n.Toolkit; import com.fr.design.locale.impl.SupportLocaleImpl; import com.fr.design.mainframe.DesignerContext; +import com.fr.design.ui.util.UIUtil; import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; import com.fr.event.Null; import com.fr.general.FRFont; -import com.fr.general.locale.LocaleAction; import com.fr.general.locale.LocaleCenter; import javax.swing.plaf.ColorUIResource; @@ -47,7 +47,7 @@ public class FineEmbedServerMonitor { @Override public void on(Event event, Null aNull) { getInstance().reset(); - progressDialog.dispose(); + UIUtil.invokeLaterIfNeeded(() -> progressDialog.dispose()); } }); } @@ -87,29 +87,24 @@ public class FineEmbedServerMonitor { public void monitor() { final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1, new NamedThreadFactory("FineEmbedServerMonitor")); - scheduler.scheduleAtFixedRate(new Runnable() { - @Override - public void run() { - if (isComplete()) { - scheduler.shutdown(); - progressDialog.dispose(); - return; - } + scheduler.scheduleAtFixedRate(() -> { + if (isComplete()) { + scheduler.shutdown(); + UIUtil.invokeLaterIfNeeded(() -> progressDialog.dispose()); + return; + } + UIUtil.invokeLaterIfNeeded(() -> { if (!progressDialog.isVisible()) { progressDialog = new ProgressDialog(DesignerContext.getDesignerFrame()); progressDialog.setVisible(true); //如果为韩文则改变字体 - LocaleCenter.buildAction(new LocaleAction() { - @Override - public void execute() { - font = FRFont.getInstance().applySize(FONT_SIZE).applyForeground(new ColorUIResource(FONT_RGB)).applyName(FONT_NAME); - } - }, SupportLocaleImpl.SUPPORT_KOREA); + LocaleCenter.buildAction(() -> font = FRFont.getInstance().applySize(FONT_SIZE).applyForeground(new ColorUIResource(FONT_RGB)).applyName(FONT_NAME), SupportLocaleImpl.SUPPORT_KOREA); String text = Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server"); progressDialog.updateLoadingText(text, font); } progressDialog.setProgressValue(getProgress()); - } + }); + }, 0, STEP_HEARTBEAT, TimeUnit.MILLISECONDS); } diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageConstants.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageConstants.java index 8c414cecfe..2dab229850 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageConstants.java +++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageConstants.java @@ -10,7 +10,7 @@ public class StartupPageConstants { /** * 圆弧长度 */ - public static final int ARC_DIAMETER = 20; + public static final int ARC_DIAMETER = 10; /** * 内容宽度 diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageUtil.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageUtil.java index 153aa4ce0e..20bf1c8464 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageUtil.java +++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageUtil.java @@ -1,7 +1,8 @@ package com.fr.startup.ui; -import com.fr.base.svg.SVGIcon; +import com.fine.theme.icon.LazyIcon; import com.fr.design.env.DesignerWorkspaceType; +import com.fr.design.gui.itree.filetree.FileTreeIcon; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -27,9 +28,9 @@ public class StartupPageUtil { public static Icon getIcon4RecentAreaByWorkspace(StartupWorkspaceBean workspaceBean) { if (workspaceBean.getType() == DesignerWorkspaceType.Local) { - return SVGIcon.readSVGIcon("/com/fr/design/startup/local_server_background_36.svg", 36, 36); + return new LazyIcon("local_server_background", 36); } - return SVGIcon.readSVGIcon("/com/fr/design/startup/remote_server_background_36.svg", 36, 36); + return new LazyIcon("remote_server_background", 36); } /** @@ -41,11 +42,11 @@ public class StartupPageUtil { public static Icon getIcon4DescAreaByWorkspace(StartupWorkspaceBean workspaceBean) { if (workspaceBean.getType() == DesignerWorkspaceType.Local) { - return SVGIcon.readSVGIcon("/com/fr/design/startup/local_server_background_28.svg", 28, 28); + return new LazyIcon("local_server_background", 28); } - return SVGIcon.readSVGIcon("/com/fr/design/startup/remote_server_background_28.svg", 28, 28); + return new LazyIcon("remote_server_background", 28); } - + /** * 返回 ip : port * diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java index 0dc3dbab15..1574a9a627 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java +++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java @@ -1,11 +1,14 @@ package com.fr.startup.ui; -import com.fr.base.svg.IconUtils; -import com.fr.concurrent.NamedThreadFactory; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.DesignerEnvManager; import com.fr.design.dialog.UIExpandDialog; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itree.filetree.FileTreeIcon; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.VerticalFlowLayout; @@ -13,7 +16,6 @@ import com.fr.design.mainframe.messagecollect.StartErrorMessageCollector; import com.fr.design.mainframe.messagecollect.entity.DesignerErrorMessage; import com.fr.design.ui.util.UIUtil; import com.fr.design.utils.ColorUtils; -import com.fr.design.utils.ThemeUtils; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.exit.DesignerExiter; import com.fr.general.GeneralUtils; @@ -26,7 +28,6 @@ import com.fr.start.common.DesignerStartupContext; import com.fr.startup.metric.DesignerMetrics; import org.jetbrains.annotations.NotNull; -import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPanel; @@ -34,12 +35,10 @@ import javax.swing.JSeparator; import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; import javax.swing.SwingWorker; -import javax.swing.border.EmptyBorder; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.GridLayout; @@ -52,8 +51,8 @@ import java.awt.event.WindowEvent; import java.awt.image.BufferedImage; import java.util.List; import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; + +import static com.fine.theme.utils.FineUIScale.scale; /** * 启动页 @@ -66,12 +65,12 @@ public class StartupPageWindow extends JFrame { private static final Color HOVER_COLOR = new Color(65, 155, 249); private static final Color SEP_COLOR = new Color(224, 224, 225); - private static final int GROUP_WIDTH = 600; + private static final int GROUP_WIDTH = scale(600); + private static final int WORKSPACE_PANEL_WIDTH = scale(180); private static final int RECENT_FILE_LIMIT = 6; - private static final int RECENT_FILE_SCROLL = RECENT_FILE_LIMIT + 1; - private static final int WORKSPACE_PANEL_WIDTH = 180; private static final int TITLE_FONT_SIZE = 24; private static final int ITEM_VERTICAL_GAP = 5; + private static final Dimension SCREEN_SIZE = java.awt.Toolkit.getDefaultToolkit().getScreenSize(); @@ -117,7 +116,7 @@ public class StartupPageWindow extends JFrame { } private void initHeaderPanel() { - this.body = FRGUIPaneFactory.createBorderLayout_S_Pane(); + this.body = new JPanel(new BorderLayout(0, scale(20))); this.body.setBackground(new Color(0, 0, 0, 0)); JPanel headerPanel = createHeader(); this.body.add(headerPanel, BorderLayout.NORTH); @@ -169,9 +168,7 @@ public class StartupPageWindow extends JFrame { // Header UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Startup_Page_Select_Workspace")); - Font font = label.getFont(); - Font titleFont = font.deriveFont(font.getStyle(), TITLE_FONT_SIZE); - label.setFont(titleFont); + FineUIUtils.setFontSize(label, TITLE_FONT_SIZE); JPanel headerPanel = new JPanel(); LayoutManager centerFlowLayout = FRGUIPaneFactory.createCenterFlowLayout(); headerPanel.setLayout(centerFlowLayout); @@ -288,18 +285,18 @@ public class StartupPageWindow extends JFrame { } private JPanel generateRecentOpenPanel(StartupPageModel pageModel) { - + Color color = FlatUIUtils.getUIColor("fill.normal", Color.WHITE); JPanel recentOpenPanel = new JPanel() { @Override protected void paintComponent(Graphics g) { Graphics2D g2d = (Graphics2D) g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setColor(Color.WHITE); - g2d.fillRoundRect(0, 0, getWidth(), getHeight(), StartupPageConstants.ARC_DIAMETER, StartupPageConstants.ARC_DIAMETER); + g2d.setColor(color); + g2d.fillRoundRect(0, 0, getWidth(), getHeight(), 2 * StartupPageConstants.ARC_DIAMETER, 2 * StartupPageConstants.ARC_DIAMETER); } }; recentOpenPanel.setLayout(new BorderLayout()); - recentOpenPanel.setBorder(BorderFactory.createEmptyBorder(25, 25, 25, 6)); + recentOpenPanel.setBorder(new ScaledEmptyBorder(25, 25, 25, 6)); StartupWorkspaceBean workspaceInfo = pageModel.getSelectWorkspaceInfo(); JPanel workspaceWrapperYPanel = new JPanel(); @@ -309,15 +306,15 @@ public class StartupPageWindow extends JFrame { JPanel workspaceWrapperXPanel = new JPanel(); workspaceWrapperXPanel.setLayout(new FlowLayout()); - workspaceWrapperXPanel.setBorder(BorderFactory.createEmptyBorder()); - + JPanel workspacePanel = new JPanel(); - workspacePanel.setLayout(new BorderLayout(0, 15)); + workspacePanel.setLayout(new BorderLayout(0, scale(15))); UILabel workspaceIcon = new UILabel(StartupPageUtil.getIcon4RecentAreaByWorkspace(workspaceInfo)); workspacePanel.add(workspaceIcon, BorderLayout.NORTH); UILabel nameLabel = new UILabel(workspaceInfo.getName()); + FineUIUtils.setFontSize(nameLabel, 15); nameLabel.setHorizontalAlignment(SwingConstants.CENTER); workspacePanel.add(nameLabel, BorderLayout.SOUTH); workspaceWrapperXPanel.add(workspacePanel); @@ -340,18 +337,17 @@ public class StartupPageWindow extends JFrame { JComponent recentOpenGroupPanel = generateRecentOpenGroupPanel(pageModel, workspaceInfo); recentOpenPanel.add(recentOpenGroupPanel, BorderLayout.EAST); - ColorUtils.syncBackground(recentOpenPanel, Color.WHITE); - + ColorUtils.syncBackground(recentOpenPanel, color); + Dimension preferredSize = recentOpenPanel.getPreferredSize(); - recentOpenPanel.setPreferredSize(new Dimension(StartupPageConstants.CONTENT_WIDTH, (int) preferredSize.getHeight())); + recentOpenPanel.setPreferredSize(new Dimension(scale(StartupPageConstants.CONTENT_WIDTH), (int) preferredSize.getHeight())); JPanel recentOpenWrapperPanel = new JPanel(); recentOpenWrapperPanel.setName("recentOpenWrapper"); recentOpenWrapperPanel.setLayout(new BorderLayout(0, 0)); - recentOpenWrapperPanel.setBorder(new EmptyBorder(0, 0, 0, 20)); recentOpenWrapperPanel.add(recentOpenPanel, BorderLayout.CENTER); - ColorUtils.syncBackgroundIfAbsent(recentOpenWrapperPanel, new Color(0,0,0,0), ThemeUtils.BACK_COLOR); + FineUIStyle.setStyle(recentOpenWrapperPanel, FineUIStyle.TRANSPARENT_BACKGROUND); return recentOpenWrapperPanel; } @@ -372,8 +368,9 @@ public class StartupPageWindow extends JFrame { for (String recentFile : recentFiles) { JPanel recentItemPanel = new JPanel(); recentItemPanel.setLayout(new FlowLayout(FlowLayout.LEFT, ITEM_VERTICAL_GAP, 0)); - recentItemPanel.add(new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/cpt"))); + recentItemPanel.add(new UILabel(FileTreeIcon.getIconByFileName(recentFile))); UILabel recentFileLabel = new UILabel(recentFile); + FineUIUtils.setFontSize(recentFileLabel, 13); Color recentFileLabelForeground = recentFileLabel.getForeground(); recentItemPanel.add(recentFileLabel); recentItemPanel.addMouseListener(new MouseAdapter() { @@ -406,7 +403,7 @@ public class StartupPageWindow extends JFrame { if (needScroll) { int scrollHeight = (int) Math.round(itemHeight * RECENT_FILE_LIMIT + ITEM_VERTICAL_GAP * (RECENT_FILE_LIMIT)); UIScrollPane scrollPane = new UIScrollPane(recentOpenGroupPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setBorder(new EmptyBorder(0, 0, 0, 0)); + scrollPane.setBorder(new ScaledEmptyBorder(0, 0, 0, 0)); scrollPane.setPreferredSize(new Dimension(GROUP_WIDTH, scrollHeight)); return scrollPane; } @@ -414,10 +411,8 @@ public class StartupPageWindow extends JFrame { } private StartupPageWorkspacePanel generateWorkspacePanel(StartupPageModel pageModel) { - - StartupPageWorkspacePanel startupPageWorkspacePanel = new StartupPageWorkspacePanel(pageModel); - ColorUtils.syncBackgroundIfAbsent(startupPageWorkspacePanel, new Color(0, 0, 0, 0), ThemeUtils.BACK_COLOR); - return startupPageWorkspacePanel; + + return new StartupPageWorkspacePanel(pageModel); } protected LayoutManager getCenterLayout(JComponent centerBody) { diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java index e41304e23b..2767f8945b 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java +++ b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java @@ -1,211 +1,223 @@ package com.fr.startup.ui; -import com.fr.base.svg.IconUtils; +import com.fine.swing.ui.layout.Column; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.components.tooltip.ModernToolTip; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.FRGraphics2D; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.utils.ColorUtils; import com.fr.start.common.DesignerStartupContext; import com.fr.startup.metric.DesignerMetrics; import com.fr.third.guava.collect.Lists; import org.jetbrains.annotations.NotNull; -import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JPanel; +import javax.swing.JScrollBar; import javax.swing.JToolTip; import javax.swing.JViewport; -import javax.swing.RepaintManager; import javax.swing.ScrollPaneConstants; -import javax.swing.border.EmptyBorder; import java.awt.BasicStroke; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.GridLayout; import java.awt.Image; import java.awt.RenderingHints; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.geom.Path2D; import java.awt.image.ImageObserver; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import static com.fine.theme.utils.FineUIScale.scale; +import static com.fine.theme.utils.FineUIStyle.setStyle; import static com.fr.startup.ui.StartupPageConstants.ARC_DIAMETER; /** * created by Harrison on 2022/07/06 **/ public class StartupPageWorkspacePanel extends JPanel { - + /* color */ - - private static final Color SHALLOW_WHITE_COLOR = new Color(248, 250, 254); + private static final Color HOVER_COLOR = new Color(65, 155, 249); private static final Color PATH_COLOR = new Color(51, 51, 52, (int) Math.round(255 * 0.5)); - + /* 长度 */ private static final int SCROLL_BAR_WIDTH = 20; - private static final int CONTENT_WIDTH = StartupPageConstants.CONTENT_WIDTH + SCROLL_BAR_WIDTH; + private static final int CONTENT_WIDTH = scale(StartupPageConstants.CONTENT_WIDTH + SCROLL_BAR_WIDTH); private static final int BORDER_THIN = 2; - - private static final int ITEM_VERTICAL_GAP = 20; - private static final int SINGLE_ITEM_HEIGHT = 72; + + private static final int ITEM_VERTICAL_GAP = scale(20); + private static final int SINGLE_ITEM_HEIGHT = scale(72); private static final int SCROLL_HEIGHT = SINGLE_ITEM_HEIGHT * 4 + ITEM_VERTICAL_GAP * 4; - + private static final int NAME_LABEL_SIZE = 15; private static final int PATH_LABEL_SIZE = 10; - - private static final Dimension LABEL_DIMENSION = new Dimension(28, 28); - private static final Dimension PATH_DIMENSION = new Dimension(100, 20); - private static final Dimension SELECT_WORKSPACE_DIMENSION = new Dimension(210, 72); - private static final Dimension SELECT_CREATE_DIMENSION = new Dimension(60, 72); - + + private static final Dimension LABEL_DIMENSION = scale(new Dimension(28, 28)); + private static final Dimension PATH_DIMENSION = scale(new Dimension(100, 20)); + private static final Dimension SELECT_WORKSPACE_DIMENSION = scale(new Dimension(210, 72)); + private static final Dimension SELECT_CREATE_DIMENSION = scale(new Dimension(70, 72)); + private static final int COLUMN_LIMIT = 3; private static final int DOUBLE_CLICK_COUNT = 2; public static final int PARTITION_LIMIT = 2; - + /* model */ - + private final StartupPageModel pageModel; - + private final List> partitions; - + private Runnable selectWorkspaceRunnable; - + private final Runnable createNewTemplateRunnable; - + private final Runnable openEmptyTemplateRunnable; - + private JComponent contentPanel; - + private JPanel tailPanel; - + private boolean showMore = true; - + public StartupPageWorkspacePanel(StartupPageModel pageModel) { - - this.setLayout(new BorderLayout(0, 0)); - this.setBorder(new EmptyBorder(15, 0, 20, 0)); - + + this.setLayout(new BorderLayout(0, scale(10))); + this.pageModel = pageModel; - + List workspaceInfos = pageModel.getWorkspaceInfos(); this.partitions = Lists.partition(workspaceInfos, COLUMN_LIMIT); - + this.contentPanel = generateLimitContentPanel(partitions); + this.add(contentPanel, BorderLayout.NORTH); - + if (partitions.size() > PARTITION_LIMIT) { this.tailPanel = generateTailPanel(); this.add(tailPanel, BorderLayout.SOUTH); } - + this.createNewTemplateRunnable = pageModel.getCreateNewTemplateRunnable(); this.openEmptyTemplateRunnable = pageModel.getOpenEmptyTemplateRunnable(); - + + setStyle(contentPanel, FineUIStyle.TRANSPARENT_BACKGROUND); + setStyle(this, FineUIStyle.TRANSPARENT_BACKGROUND); + this.repaint(); } - + public void showLessContent() { - + this.remove(this.contentPanel); - + this.contentPanel = generateLimitContentPanel(this.partitions); this.add(contentPanel, BorderLayout.NORTH); } - + public void showMoreContent() { - + this.remove(this.contentPanel); - + this.contentPanel = generateUnLimitContentPanel(this.partitions); + this.contentPanel.setOpaque(false); this.add(contentPanel, BorderLayout.NORTH); } private JComponent generateUnLimitContentPanel(List> partitions) { - + JComponent panel = generateUnLimitContentPanel0(partitions); - ColorUtils.transparentBackground(panel); + setStyle(panel, FineUIStyle.TRANSPARENT_BACKGROUND); return panel; } - + private JComponent generateUnLimitContentPanel0(List> partitions) { - + JPanel workspaceDescWrapper = new JPanel(); - workspaceDescWrapper.setLayout(new BorderLayout(0, 0)); - workspaceDescWrapper.setBorder(new EmptyBorder(0, 0, 0, 0)); - - JPanel workspaceDescPanel = new JPanel(); - workspaceDescPanel.setLayout(new GridLayout(partitions.size(), 1, 0, 0)); + setStyle(workspaceDescWrapper, FineUIStyle.TRANSPARENT_BACKGROUND); + workspaceDescWrapper.setLayout(new BorderLayout()); + Column workSpaceDescPanel = new Column(); + workSpaceDescPanel.setSpacing(20); + setStyle(workSpaceDescPanel, FineUIStyle.TRANSPARENT_BACKGROUND); for (List partition : partitions) { JPanel partitionPanel = generatePartitionPanel(partition); - workspaceDescPanel.add(partitionPanel); + workSpaceDescPanel.add(partitionPanel); } boolean needScroll = partitions.size() > 4; if (needScroll) { - return generateScrollUnLimitContentPanel(workspaceDescWrapper, workspaceDescPanel); + return generateScrollUnLimitContentPanel(workspaceDescWrapper, workSpaceDescPanel); } - workspaceDescWrapper.add(workspaceDescPanel, BorderLayout.CENTER); - + workspaceDescWrapper.add(workSpaceDescPanel, BorderLayout.CENTER); return workspaceDescWrapper; } - + @NotNull private JPanel generateScrollUnLimitContentPanel(JPanel workspaceDescWrapper, JPanel workspaceDescPanel) { - + // 滚动条 - UIScrollPane scrollPane = new UIScrollPane(workspaceDescPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + UIScrollPane scrollPane = new UIScrollPane(workspaceDescPanel, + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + workspaceDescWrapper.setPreferredSize(new Dimension(CONTENT_WIDTH + SCROLL_BAR_WIDTH, SCROLL_HEIGHT)); + JViewport viewport = scrollPane.getViewport(); JViewport scrollViewport = new TransparentScrollViewPort(); // 动态画图 scrollViewport.addChangeListener(e -> repaintAll()); scrollViewport.setView(viewport.getView()); scrollPane.setViewport(scrollViewport); - scrollPane.setBorder(new EmptyBorder(10, 0, 0, 0)); - scrollPane.setPreferredSize(new Dimension(CONTENT_WIDTH, SCROLL_HEIGHT)); + // 透明度配置 + InReactiveScrollBar bar = new InReactiveScrollBar(); + scrollPane.setVerticalScrollBar(bar); + setStyle(bar, FineUIStyle.TRANSPARENT_BACKGROUND); + scrollViewport.setOpaque(false); + workspaceDescWrapper.add(scrollPane, BorderLayout.CENTER); - return workspaceDescWrapper; } - + private JPanel generateLimitContentPanel(List> partitions) { - - JPanel workspaceDescPanel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEFT, 0, 0); + + Column workspaceDescPanel = new Column(); + workspaceDescPanel.setSpacing(20); int limit = 2; for (int i = 0; i < partitions.size(); i++) { if (i >= limit) { break; } List partition = partitions.get(i); - + JPanel partitionPanel = generatePartitionPanel(partition); workspaceDescPanel.add(partitionPanel); } - - ColorUtils.transparentBackground(workspaceDescPanel); - + + setStyle(workspaceDescPanel, FineUIStyle.TRANSPARENT_BACKGROUND); return workspaceDescPanel; } - + @NotNull private JPanel generateTailPanel() { - + AtomicReference hoverBackColorRef = new AtomicReference<>(); - + JPanel tailPanel = new JPanel(); { tailPanel.setLayout(new FlowLayout(FlowLayout.RIGHT)); - tailPanel.setBorder(new EmptyBorder(0, 0, 0, 20)); JPanel showAllPanel = new JPanel() { @Override protected void paintComponent(Graphics g) { @@ -217,34 +229,17 @@ public class StartupPageWorkspacePanel extends JPanel { } } }; - showAllPanel.setLayout(new BorderLayout(5, 0)); - showAllPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - + showAllPanel.setLayout(new BorderLayout()); + UILabel fontLabel = new UILabel(Toolkit.i18nText("Fine-Design_Startup_Page_Expand_All")); - fontLabel.setForeground(HOVER_COLOR); - showAllPanel.setBackground(new Color(0, 0, 0, 0)); + fontLabel.setForeground(FlatUIUtils.getUIColor("brand.normal", HOVER_COLOR)); showAllPanel.add(fontLabel, BorderLayout.WEST); - - UILabel iconLabel = new UILabel(IconUtils.readIcon("/com/fr/design/startup/show_more.svg")); + setStyle(showAllPanel, FineUIStyle.TRANSPARENT_BACKGROUND); + + UILabel iconLabel = new UILabel(new LazyIcon("show_more")); showAllPanel.add(iconLabel, BorderLayout.EAST); - - Color showAllBackground = showAllPanel.getBackground(); - - showAllPanel.addMouseListener(new MouseAdapter() { - @Override - public void mouseEntered(MouseEvent e) { - Color hoverBackColor = new Color(217, 235, 254); - hoverBackColorRef.set(hoverBackColor); - repaintAll(); - } - @Override - public void mouseExited(MouseEvent e) { - hoverBackColorRef.set(null); - ColorUtils.syncBackground(showAllPanel, showAllBackground); - repaintAll(); - } - + showAllPanel.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent e) { doShowAllAction(fontLabel, iconLabel); @@ -252,172 +247,132 @@ public class StartupPageWorkspacePanel extends JPanel { }); tailPanel.add(showAllPanel); Dimension preferredSize = tailPanel.getPreferredSize(); - tailPanel.setPreferredSize(new Dimension(CONTENT_WIDTH, (int) preferredSize.getHeight())); + tailPanel.setPreferredSize(new Dimension(scale(StartupPageConstants.CONTENT_WIDTH), (int) preferredSize.getHeight())); } + setStyle(tailPanel, FineUIStyle.TRANSPARENT_BACKGROUND); return tailPanel; } - + @NotNull private JPanel generatePartitionPanel(List partition) { - - JPanel partitionPanelWrapper = new JPanel(); - partitionPanelWrapper.setBorder(new EmptyBorder(10,0,10,0)); - partitionPanelWrapper.setLayout(new BorderLayout()); - - JPanel partitionPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 20, 0); - partitionPanel.setName("partitionPanel"); - + + List workSpacePaneList = new ArrayList<>(); for (StartupWorkspaceBean workspaceInfo : partition) { - + JPanel workspaceItemDesc = FRGUIPaneFactory.createBorderLayout_S_Pane(); - + layoutSelectWorkspacePanel(workspaceInfo, workspaceItemDesc); - + layoutSelectAndCreatePanel(workspaceInfo, workspaceItemDesc); - - partitionPanel.add(workspaceItemDesc); - - Dimension preferredSize = partitionPanel.getPreferredSize(); - partitionPanel.setPreferredSize(new Dimension(CONTENT_WIDTH, (int) preferredSize.getHeight())); + + setStyle(workspaceItemDesc, FineUIStyle.TRANSPARENT_BACKGROUND); + + workSpacePaneList.add(workspaceItemDesc); } - - partitionPanelWrapper.add(partitionPanel, BorderLayout.CENTER); + + JPanel singleRow = FineLayoutBuilder.createCommonTableLayout(3, 20, 0, workSpacePaneList); + singleRow.setName("partitionPanel"); + + JPanel partitionPanelWrapper = FineLayoutBuilder.asBorderLayoutWrapped(singleRow); + setStyle(singleRow, FineUIStyle.TRANSPARENT_BACKGROUND); + setStyle(partitionPanelWrapper, FineUIStyle.TRANSPARENT_BACKGROUND); return partitionPanelWrapper; } - + private void layoutSelectWorkspacePanel(StartupWorkspaceBean workspaceInfo, JPanel workspaceItemDesc) { - + // 选择工作目录 // 图标 / 分隔符 / 说明-进入 // 选择并新建 AtomicReference borderColorRef = new AtomicReference<>(null); - + JPanel selectWorkspacePanel = new JPanel() { @Override public JToolTip createToolTip() { return new ModernToolTip(); } - + @Override protected void paintComponent(Graphics g) { Graphics2D g2d = (Graphics2D) g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - Color borderColor = borderColorRef.get(); - - Color backColor = Color.WHITE; + + Color backColor = FlatUIUtils.getUIColor("fill.normal", Color.WHITE); g2d.setColor(backColor); - // 直角和圆角上下叠合在一起 - int rectOffset = 10; - int roundOffset = 15; - // 填充一个直角 - g2d.fillRoundRect(0, 0, getWidth() - rectOffset, getHeight(), ARC_DIAMETER, ARC_DIAMETER); - // 填充一个圆角 - g2d.fillRoundRect(getWidth() - roundOffset, 0, roundOffset, getHeight(), 0, 0); + Path2D path2D = FineUIUtils.createLeftRoundRectangle(0, 0, this.getWidth(), this.getHeight(), ARC_DIAMETER); + g2d.fill(path2D); + + Color borderColor = borderColorRef.get(); paintBorderIfHover(g2d, borderColor, backColor); } - + /** * 当悬浮的时候，将边框展示出来 - * 会叠合，然后填充中间 - * - * |----【-｜--】 - * | A 【C｜ B】 - * |----【-｜--】 - * - * 见上面有两种线，分别是 A-｜ 和 B-【 - * 这里会将 A 和 B 叠在一起，中间则存在 C，然后将 C 的部分扩大一点，然后填充上背景 - * 则形成下面这种图形 - * - * |----】 - * |----】 - * * @param g2d 绘画 * @param borderColor 边框颜色 * @param backColor 背景颜色 */ private void paintBorderIfHover(Graphics2D g2d, Color borderColor, Color backColor) { - + if (borderColor != null) { g2d.setColor(borderColor); g2d.setStroke(new BasicStroke(BORDER_THIN)); - // 需要一个修正值 - int strokeOffset = BORDER_THIN / 2; - // 直角和圆角上下叠合在一起 - int rectOffset = 10; - int roundOffset = 15; - // 画一个圆角 - int fixRoundWidth = getWidth() - rectOffset; - int fixRoundHeight = getHeight() - BORDER_THIN; - g2d.drawRoundRect(strokeOffset, strokeOffset, fixRoundWidth, fixRoundHeight, ARC_DIAMETER, ARC_DIAMETER); - - g2d.setColor(backColor); - - // 绘制一个矩形，覆盖住多余的相交线 - // 需要考虑上下的线宽 - int coverHeight = getHeight() - (BORDER_THIN * 2); - // 偏左一点的 fixedX - int fixedX = getWidth() - roundOffset - BORDER_THIN; - // 圆角和直角相交的区域 - int coverWidth = 15; - g2d.fillRect(fixedX, BORDER_THIN, coverWidth, coverHeight); - - g2d.setColor(borderColor); - g2d.drawLine(getWidth() / 2, strokeOffset, getWidth(), strokeOffset); - g2d.drawLine(getWidth() / 2, getHeight() - strokeOffset, getWidth(), getHeight() - strokeOffset); - g2d.drawLine(getWidth() - strokeOffset, strokeOffset, getWidth() - strokeOffset, getHeight() - strokeOffset); + FlatUIUtils.setRenderingHints(g2d); + Path2D path2D = FineUIUtils.createLeftRoundRectangle(0, 0, + getWidth() - BORDER_THIN, getHeight() - BORDER_THIN, ARC_DIAMETER); + g2d.draw(path2D); } } }; - selectWorkspacePanel.setLayout(new BorderLayout(0,0)); + selectWorkspacePanel.setLayout(new BorderLayout()); selectWorkspacePanel.setToolTipText(Toolkit.i18nText("Fine-Design_Startup_Page_Double_Click_Enter_Workspace")); - selectWorkspacePanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + selectWorkspacePanel.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); { - + JPanel iconPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - iconPanel.setBorder(new EmptyBorder(0, 10, 0, 10)); Icon icon = StartupPageUtil.getIcon4DescAreaByWorkspace(workspaceInfo); UILabel label = new UILabel(icon); label.setPreferredSize(LABEL_DIMENSION); iconPanel.add(label, BorderLayout.CENTER); + iconPanel.setOpaque(false); selectWorkspacePanel.add(iconPanel, BorderLayout.WEST); - + // desc / >箭头 JPanel descPanel = new JPanel(); + descPanel.setOpaque(false); descPanel.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - descPanel.setBorder(new EmptyBorder(0, 10, 0, 0)); JPanel simpleDescPanelWrapper = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.CENTER, 0, 0); JPanel simpleDescPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); UILabel nameLabel = new UILabel(workspaceInfo.getName()); - Font font = nameLabel.getFont(); - Font newSizeFont = font.deriveFont(font.getStyle(), NAME_LABEL_SIZE); - nameLabel.setFont(newSizeFont); + FineUIUtils.setFontSize(nameLabel, NAME_LABEL_SIZE); nameLabel.setPreferredSize(PATH_DIMENSION); Color nameForeground = nameLabel.getForeground(); simpleDescPanel.add(nameLabel,BorderLayout.NORTH); - + UILabel pathLabel = new UILabel(workspaceInfo.getPath()); pathLabel.setPreferredSize(PATH_DIMENSION); - Font pathFont = pathLabel.getFont(); - pathLabel.setFont(pathFont.deriveFont(pathFont.getStyle(), PATH_LABEL_SIZE)); + FineUIUtils.setFontSize(pathLabel, PATH_LABEL_SIZE); Color pathColor = PATH_COLOR; pathLabel.setForeground(pathColor); simpleDescPanel.add(pathLabel, BorderLayout.SOUTH); + simpleDescPanel.setOpaque(false); simpleDescPanelWrapper.add(simpleDescPanel); - + simpleDescPanelWrapper.setOpaque(false); + descPanel.add(simpleDescPanelWrapper, BorderLayout.WEST); - + MouseAdapter selectWorkspaceMouseListener = new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - Color hoverColor = HOVER_COLOR; + Color hoverColor = FlatUIUtils.getUIColor("brand.normal", HOVER_COLOR); borderColorRef.set(hoverColor); nameLabel.setForeground(hoverColor); pathLabel.setForeground(hoverColor ); repaintAll(); } - + @Override public void mouseExited(MouseEvent e) { borderColorRef.set(Color.WHITE); @@ -436,10 +391,10 @@ public class StartupPageWorkspacePanel extends JPanel { } doSwitchWorkspace(workspaceInfo); } - + }; - - UILabel arrowLabel = new UILabel(IconUtils.readIcon("/com/fr/design/startup/more.svg")) { + + UILabel arrowLabel = new UILabel(new LazyIcon("more_arrow", 20)) { @Override public JToolTip createToolTip() { return new ModernToolTip(); @@ -449,13 +404,13 @@ public class StartupPageWorkspacePanel extends JPanel { arrowLabel.addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - arrowLabel.setIcon(IconUtils.readIcon("/com/fr/design/startup/more_hover.svg")); + arrowLabel.setIcon(new LazyIcon("more_arrow_hover", 20)); selectWorkspaceMouseListener.mouseEntered(e); } - + @Override public void mouseExited(MouseEvent e) { - arrowLabel.setIcon(IconUtils.readIcon("/com/fr/design/startup/more.svg")); + arrowLabel.setIcon(new LazyIcon("more_arrow", 20)); selectWorkspaceMouseListener.mouseExited(e); } @@ -465,18 +420,16 @@ public class StartupPageWorkspacePanel extends JPanel { } }); descPanel.add(arrowLabel, BorderLayout.EAST); - selectWorkspacePanel.add(descPanel, BorderLayout.CENTER); selectWorkspacePanel.addMouseListener(selectWorkspaceMouseListener); } - - ColorUtils.syncBackground(selectWorkspacePanel, Color.WHITE); + selectWorkspacePanel.setPreferredSize(SELECT_WORKSPACE_DIMENSION); workspaceItemDesc.add(selectWorkspacePanel, BorderLayout.WEST); } - + private void layoutSelectAndCreatePanel(StartupWorkspaceBean workspaceInfo, JPanel workspaceItemDesc) { - + // 选择并新建 AtomicReference borderColorRef = new AtomicReference<>(null); JPanel selectAndCreatePanel = new JPanel() { @@ -489,58 +442,43 @@ public class StartupPageWorkspacePanel extends JPanel { protected void paintComponent(Graphics g) { Graphics2D g2d = (Graphics2D) g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - Color borderColor = borderColorRef.get(); - - Color backColor = SHALLOW_WHITE_COLOR; + + Color backColor = FlatUIUtils.getUIColor("fill.deep", Color.GRAY); g2d.setColor(backColor); - - // 见 layoutSelectWorkspacePanel 部分的分析 - // 直角和圆角上下叠合在一起 - int rectOffset = 10; - int roundOffset = 15; - int strokeOffset = BORDER_THIN / 2; - int fixedRoundOffset = roundOffset + strokeOffset; - g2d.fillRoundRect(0, 0, getWidth() - rectOffset, getHeight(), 0, 0); - g2d.fillRoundRect(getWidth() - fixedRoundOffset, 0, roundOffset, getHeight(), ARC_DIAMETER, ARC_DIAMETER); + Path2D shape = FineUIUtils.createRightRoundRectangle(0, 0, this.getWidth(), this.getHeight(), ARC_DIAMETER); + g2d.fill(shape); + + Color borderColor = borderColorRef.get(); if (borderColor != null) { g2d.setColor(borderColor); g2d.setStroke(new BasicStroke(BORDER_THIN)); - - int borderOffset = BORDER_THIN * 2; - // 画画的笔触需要调整一下 - g2d.drawRoundRect(strokeOffset, strokeOffset, getWidth() - borderOffset, getHeight() - BORDER_THIN, ARC_DIAMETER, ARC_DIAMETER); - g2d.setColor(backColor); - int fillWidth = 15; - g2d.fillRect(0, 0, fillWidth, getHeight()); - - g2d.setColor(borderColor); - g2d.drawLine(strokeOffset, strokeOffset, fillWidth, strokeOffset); - g2d.drawLine(strokeOffset, getHeight() - strokeOffset, fillWidth, getHeight() - strokeOffset); - g2d.drawLine(strokeOffset, strokeOffset, strokeOffset, getHeight() - strokeOffset); + FlatUIUtils.setRenderingHints(g2d); + Path2D path2D = FineUIUtils.createRightRoundRectangle(0, 0, + getWidth() - BORDER_THIN, getHeight() - BORDER_THIN, ARC_DIAMETER); + g2d.draw(path2D); } } - + }; selectAndCreatePanel.setToolTipText(Toolkit.i18nText("Fine-Design_Startup_Page_Enter_Workspace_And_Create")); - selectAndCreatePanel.setBorder(new EmptyBorder(0, 0, 0, 0)); selectAndCreatePanel.setLayout(new BorderLayout()); { - UILabel label = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/add")); + UILabel label = new UILabel(new LazyIcon("add", 20)); label.setPreferredSize(new Dimension(ARC_DIAMETER, ARC_DIAMETER)); - label.setForeground(HOVER_COLOR); + label.setForeground(FlatUIUtils.getUIColor("brand.normal", HOVER_COLOR)); selectAndCreatePanel.add(label, BorderLayout.CENTER); selectAndCreatePanel.addMouseListener(new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { - borderColorRef.set(HOVER_COLOR); - label.setIcon(IconUtils.readIcon("/com/fr/design/standard/system/add_hover.svg")); + borderColorRef.set(FlatUIUtils.getUIColor("brand.normal", HOVER_COLOR)); + label.setIcon(new LazyIcon("add_hover", 20)); repaintAll(); } - + @Override public void mouseExited(MouseEvent e) { borderColorRef.set(null); - label.setIcon(IconUtils.readIcon("/com/fr/design/standard/system/add")); + label.setIcon(new LazyIcon("add", 20)); repaintAll(); } @Override @@ -550,73 +488,91 @@ public class StartupPageWorkspacePanel extends JPanel { } }); } - ColorUtils.syncBackground(selectAndCreatePanel, Color.GREEN); selectAndCreatePanel.setPreferredSize(SELECT_CREATE_DIMENSION); workspaceItemDesc.add(selectAndCreatePanel, BorderLayout.EAST); } - + public void setSelectWorkspaceRunnable(Runnable selectWorkspaceRunnable) { - + this.selectWorkspaceRunnable = selectWorkspaceRunnable; } - + private void doOpenEmptyTemplate(StartupWorkspaceBean workspaceInfo) { - + pageModel.setSelectWorkspaceInfo(workspaceInfo); openEmptyTemplateRunnable.run(); - + DesignerMetrics designerMetrics = DesignerStartupContext.getInstance().getDesignerMetrics(); designerMetrics.getStatistic().recordOpenEmptyTemplate(); } - + private void doSwitchWorkspace(StartupWorkspaceBean workspaceInfo) { - + StartupWorkspaceBean lastWorkspaceInfo = pageModel.getSelectWorkspaceInfo(); // selectWorkspaceRunnable pageModel.setSelectWorkspaceInfo(workspaceInfo); selectWorkspaceRunnable.run(); - + DesignerMetrics designerMetrics = DesignerStartupContext.getInstance().getDesignerMetrics(); designerMetrics.getStatistic().recordSwitchWorkspace(lastWorkspaceInfo, workspaceInfo); } - + private void doShowAllAction(UILabel fontLabel, UILabel iconLabel) { - + if (showMore) { fontLabel.setText(Toolkit.i18nText("Fine-Design_Startup_Page_Collapse_Workspace")); - iconLabel.setIcon(IconUtils.readIcon("/com/fr/design/startup/show_less.svg")); + iconLabel.setIcon(new LazyIcon("show_less")); showMoreContent(); showMore = !showMore; } else { fontLabel.setText(Toolkit.i18nText("Fine-Design_Startup_Page_Expand_All")); - iconLabel.setIcon(IconUtils.readIcon("/com/fr/design/startup/show_more.svg")); + iconLabel.setIcon(new LazyIcon("show_more")); showLessContent(); showMore = !showMore; } DesignerMetrics designerMetrics = DesignerStartupContext.getInstance().getDesignerMetrics(); designerMetrics.getStatistic().recordShowAllAction(); - + repaintAll(); } - + private void repaintAll() { - + this.getRootPane().repaint(); } - + /** * 支持透明的滚动视图 */ - private class TransparentScrollViewPort extends JViewport { - + private static class TransparentScrollViewPort extends JViewport { + /** - * 从而屏蔽掉 {@link RepaintManager.PaintManager#paintDoubleBuffered(JComponent, Image, Graphics, int, int, int, int)} - * * @return 创建一个不会实际画图的 Graphics */ @Override public Graphics getGraphics() { - + + Graphics graphics = super.getGraphics(); + return new FRGraphics2D((Graphics2D) graphics) { + @Override + public boolean drawImage(Image img, int x, int y, ImageObserver observer) { + return true; + } + }; + } + } + + /** + * 支持透明的滚动条 + */ + private static class InReactiveScrollBar extends JScrollBar { + + /** + * @return 创建一个不会实际画图的 Graphics + */ + @Override + public Graphics getGraphics() { + Graphics graphics = super.getGraphics(); return new FRGraphics2D((Graphics2D) graphics) { @Override diff --git a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java index 21c7f3ac93..1debda8e50 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java +++ b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java @@ -1,15 +1,15 @@ package com.fr.widgettheme.designer; +import com.fine.theme.icon.LazyIcon; import com.fr.base.io.BaseBook; -import com.fr.base.svg.IconUtils; import com.fr.design.actions.JTemplateAction; -import com.fr.widgettheme.util.WidgetThemeDesignerUtils; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr; +import com.fr.widgettheme.util.WidgetThemeDesignerUtils; import java.awt.event.ActionEvent; @@ -25,7 +25,7 @@ public class WidgetThemeDisplayAction> extends JTempla public WidgetThemeDisplayAction(T jwb) { super(jwb); setName(Toolkit.i18nText("Fine-Design_Widget_Display_Enhance")); - this.setSmallIcon(IconUtils.readIcon("/com/fr/widgettheme/menu.svg")); + this.setSmallIcon(new LazyIcon("widgetThemeMenu")); } @Override diff --git a/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayReportThemePreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayReportThemePreviewPane.java index a943cf4c4c..e6fbed957c 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayReportThemePreviewPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayReportThemePreviewPane.java @@ -1,5 +1,6 @@ package com.fr.widgettheme.theme.panel; +import com.fine.theme.utils.FineUIScale; import com.fr.base.background.ColorBackground; import com.fr.base.theme.ReportTheme; import com.fr.chart.chartattr.ChartCollection; @@ -44,14 +45,14 @@ public class WidgetDisplayReportThemePreviewPane extends TemplateThemePreviewPan public WidgetDisplayReportThemePreviewPane() { setLayout(FRGUIPaneFactory.createBorderLayout()); chartPreviewPane = new ChartPreviewPane(); - chartPreviewPane.setPreferredSize(new Dimension(615, 207)); + chartPreviewPane.setPreferredSize(FineUIScale.scale(new Dimension(615, 207))); chartPreviewPane.populate(initColumnChart()); chartPreviewPane.setCallbackEvent(this); reportPreviewPane = new WidgetThemeECReportPreviewPane(); - reportPreviewPane.setPreferredSize(new Dimension(615, 257)); + reportPreviewPane.setPreferredSize(FineUIScale.scale(new Dimension(615, 257))); controlPreviewPane = new ControlPreviewPane(); controlPreviewPane.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); - controlPreviewPane.setPreferredSize(new Dimension(615, 40)); + controlPreviewPane.setPreferredSize(FineUIScale.scale(new Dimension(615, 40))); controlPreviewPane.initControlPreviewPane(); this.add(reportPreviewPane, BorderLayout.CENTER); this.add(chartPreviewPane, BorderLayout.SOUTH); diff --git a/designer-base/src/main/resources/com/fine/theme/icon/add.svg b/designer-base/src/main/resources/com/fine/theme/icon/add.svg new file mode 100644 index 0000000000..24f1235ada --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/add.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/add_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/add_disable.svg new file mode 100644 index 0000000000..b46e7d9a5b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/add_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/add_hover.svg b/designer-base/src/main/resources/com/fine/theme/icon/add_hover.svg new file mode 100644 index 0000000000..f1e8fadf5d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/add_hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column.svg b/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column.svg new file mode 100755 index 0000000000..a3ed6545ca --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column.svg @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column_disable.svg new file mode 100755 index 0000000000..5858a92481 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column_disable.svg @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/all.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/all.svg new file mode 100644 index 0000000000..18e1d13096 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/all.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/bottom.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/bottom.svg new file mode 100644 index 0000000000..13542782b0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/bottom.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/bottom_thick.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/bottom_thick.svg new file mode 100644 index 0000000000..c4f8020e34 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/bottom_thick.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/double_bottom.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/double_bottom.svg new file mode 100644 index 0000000000..70023c6016 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/double_bottom.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/horizontal.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/horizontal.svg new file mode 100644 index 0000000000..d5c6201be7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/horizontal.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/in.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/in.svg new file mode 100644 index 0000000000..e9b1d1277c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/in.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/left.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/left.svg new file mode 100644 index 0000000000..450833cadc --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/left.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/none.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/none.svg new file mode 100644 index 0000000000..50ea0bfc72 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/none.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/out.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/out.svg new file mode 100644 index 0000000000..f5a32e2fcc --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/out.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/out_thick.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/out_thick.svg new file mode 100644 index 0000000000..2cab9efcd5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/out_thick.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/right.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/right.svg new file mode 100644 index 0000000000..087f06c6c6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/right.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/top.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/top.svg new file mode 100644 index 0000000000..a406e406a0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/top.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/top_bottom.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/top_bottom.svg new file mode 100644 index 0000000000..68a4f264e6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/top_bottom.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/top_double_bottom.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/top_double_bottom.svg new file mode 100644 index 0000000000..bb10e60255 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/top_double_bottom.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/top_thick_bottom.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/top_thick_bottom.svg new file mode 100644 index 0000000000..0a3c261eb9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/top_thick_bottom.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/border/vertical.svg b/designer-base/src/main/resources/com/fine/theme/icon/border/vertical.svg new file mode 100644 index 0000000000..f73700628b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/border/vertical.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellClear.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellClear.svg new file mode 100755 index 0000000000..df2c632f8e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellClear.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellClear_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellClear_disable.svg new file mode 100755 index 0000000000..559e6856ec --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellClear_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellConditionalAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellConditionalAttr.svg new file mode 100755 index 0000000000..2f88d20627 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellConditionalAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellConditionalAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellConditionalAttr_disable.svg new file mode 100755 index 0000000000..b6d8aff07b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellConditionalAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellElementAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellElementAttr.svg new file mode 100755 index 0000000000..64367b9b29 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellElementAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellElementAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellElementAttr_disable.svg new file mode 100755 index 0000000000..623de600ec --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellElementAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellExpandAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellExpandAttr.svg new file mode 100755 index 0000000000..a2b023102d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellExpandAttr.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellExpandAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellExpandAttr_disable.svg new file mode 100755 index 0000000000..e0d2bf1341 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellExpandAttr_disable.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellHyperLinkAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellHyperLinkAttr.svg new file mode 100755 index 0000000000..317e1dd9a7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellHyperLinkAttr.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellHyperLinkAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellHyperLinkAttr_disable.svg new file mode 100755 index 0000000000..24dbe0af7d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellHyperLinkAttr_disable.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellOtherAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellOtherAttr.svg new file mode 100755 index 0000000000..73c33af502 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellOtherAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellOtherAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellOtherAttr_disable.svg new file mode 100755 index 0000000000..1b59fa856e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellOtherAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellPresentAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellPresentAttr.svg new file mode 100755 index 0000000000..ad1acee124 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellPresentAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellPresentAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellPresentAttr_disable.svg new file mode 100755 index 0000000000..d5334fcdca --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellPresentAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect.svg new file mode 100644 index 0000000000..46c490c2e5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect_disable.svg new file mode 100644 index 0000000000..f1c2d764ca --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellSelect_disable.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellStyleAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellStyleAttr.svg new file mode 100755 index 0000000000..391906e7bf --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellStyleAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellStyleAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellStyleAttr_disable.svg new file mode 100755 index 0000000000..7e40dd5fef --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellStyleAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellWidgetAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellWidgetAttr.svg new file mode 100755 index 0000000000..c919716b53 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellWidgetAttr.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/cellWidgetAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellWidgetAttr_disable.svg new file mode 100755 index 0000000000..271256d571 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/cellWidgetAttr_disable.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark.svg new file mode 100644 index 0000000000..20a19e8095 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg new file mode 100644 index 0000000000..d55b453515 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cell/selectedMark_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellelement.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellelement.svg new file mode 100644 index 0000000000..0f46244577 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellelement.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellelement_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellelement_disable.svg new file mode 100644 index 0000000000..c4f26a528b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellelement_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_center.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_center.svg new file mode 100755 index 0000000000..4a52aa1cfe --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_center.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_justify.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_justify.svg new file mode 100644 index 0000000000..77c336cb82 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_justify.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_left.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_left.svg new file mode 100755 index 0000000000..dbc0b2c62a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_left.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_normal.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_normal.svg new file mode 100644 index 0000000000..bb67ef75ca --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_normal.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_right.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_right.svg new file mode 100755 index 0000000000..d8a38dc46b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_right.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_bottom.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_bottom.svg new file mode 100644 index 0000000000..159c2cbace --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_bottom.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_center.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_center.svg new file mode 100644 index 0000000000..4dfa2a6d47 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_center.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_top.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_top.svg new file mode 100644 index 0000000000..a4c2f871ed --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/v_top.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg new file mode 100644 index 0000000000..8f81cbbc5a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg new file mode 100644 index 0000000000..4fc8136dc8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_area_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg new file mode 100644 index 0000000000..e46f246cdd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg new file mode 100644 index 0000000000..0e5c877e9c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bar_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg new file mode 100644 index 0000000000..0688631e45 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg new file mode 100644 index 0000000000..dc9edba5ff --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_box_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg new file mode 100644 index 0000000000..ca523c7c0f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg new file mode 100644 index 0000000000..d6e572f913 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_bubble_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg new file mode 100644 index 0000000000..c42f1aaec5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg new file mode 100644 index 0000000000..c42f1aaec5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_column_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg new file mode 100644 index 0000000000..192d2e0e6f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg new file mode 100644 index 0000000000..4b75b72996 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_combine_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg new file mode 100644 index 0000000000..1b79ccf0c5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg new file mode 100644 index 0000000000..5432d8553a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_donut_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg new file mode 100644 index 0000000000..7d3ad39bd0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg new file mode 100644 index 0000000000..c6ae8d45e2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_drillMap_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg new file mode 100644 index 0000000000..a5c0947864 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg new file mode 100644 index 0000000000..f8f5d1672e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_frame_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg new file mode 100644 index 0000000000..38c6b9c525 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg new file mode 100644 index 0000000000..e5a8f9b037 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_funnel_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg new file mode 100644 index 0000000000..87afc1632e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg new file mode 100644 index 0000000000..bf5bd3310b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_gantt_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg new file mode 100644 index 0000000000..c1fba56268 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg new file mode 100644 index 0000000000..4a9bbdbe5a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_heatMap_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg new file mode 100644 index 0000000000..1944a1a3e6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg new file mode 100644 index 0000000000..46a63ac5e1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_line_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg new file mode 100644 index 0000000000..640e559a65 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg new file mode 100644 index 0000000000..2981e56009 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_map_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg new file mode 100644 index 0000000000..628c8e9427 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg new file mode 100644 index 0000000000..34ba74c767 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_meter_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg new file mode 100644 index 0000000000..a3e19df05e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg new file mode 100644 index 0000000000..b5a857ea1b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_multiPie_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg new file mode 100644 index 0000000000..3f91786579 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg new file mode 100644 index 0000000000..eb2aa01fcb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_pie_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg new file mode 100644 index 0000000000..9733be8db8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg new file mode 100644 index 0000000000..397861c466 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_radar_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg new file mode 100644 index 0000000000..ccdc01b086 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg new file mode 100644 index 0000000000..a6859c28b8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_rectangleTree_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg new file mode 100644 index 0000000000..a188a44a74 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg new file mode 100644 index 0000000000..e6da133c3d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_scatter_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg new file mode 100644 index 0000000000..0731d72aed --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg new file mode 100644 index 0000000000..d270456cf1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/chart_wordCloud_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg new file mode 100644 index 0000000000..f73c622be4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg new file mode 100644 index 0000000000..71c4959764 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/chart/polyReportBlock_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked.svg new file mode 100644 index 0000000000..5323d23b6d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked_disable.svg new file mode 100644 index 0000000000..88df5c1a59 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/hovered.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/hovered.svg new file mode 100644 index 0000000000..54a7539d4d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/hovered.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/part_checked.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/part_checked.svg new file mode 100644 index 0000000000..caeebfd58c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/part_checked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked.svg new file mode 100644 index 0000000000..86fa2f7148 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked_disable.svg new file mode 100644 index 0000000000..cab88105ee --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/clear.svg b/designer-base/src/main/resources/com/fine/theme/icon/clear.svg new file mode 100644 index 0000000000..b30c3ab503 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/clear.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/clear_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/clear_disable.svg new file mode 100644 index 0000000000..cc53697325 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/clear_disable.svg @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/clear_hover.svg b/designer-base/src/main/resources/com/fine/theme/icon/clear_hover.svg new file mode 100644 index 0000000000..6981454e9e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/clear_hover.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/close/close.svg b/designer-base/src/main/resources/com/fine/theme/icon/close/close.svg new file mode 100755 index 0000000000..3b296b0df9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/close/close.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/close/close_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/close/close_disable.svg new file mode 100755 index 0000000000..b193f33216 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/close/close_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/close/close_round.svg b/designer-base/src/main/resources/com/fine/theme/icon/close/close_round.svg new file mode 100755 index 0000000000..280c99d21c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/close/close_round.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/close/close_round_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/close/close_round_disable.svg new file mode 100755 index 0000000000..1512a9aff6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/close/close_round_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/close/platform_close.svg b/designer-base/src/main/resources/com/fine/theme/icon/close/platform_close.svg new file mode 100644 index 0000000000..a2be848c0d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/close/platform_close.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/colorPicker.svg b/designer-base/src/main/resources/com/fine/theme/icon/colorPicker.svg new file mode 100644 index 0000000000..2c6425c37c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/colorPicker.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/copy.svg b/designer-base/src/main/resources/com/fine/theme/icon/copy.svg new file mode 100644 index 0000000000..160be86092 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/copy.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/copy_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/copy_disable.svg new file mode 100644 index 0000000000..786ba17b82 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/copy_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cut.svg b/designer-base/src/main/resources/com/fine/theme/icon/cut.svg new file mode 100644 index 0000000000..6cb12c56e8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cut.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cut_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/cut_disable.svg new file mode 100644 index 0000000000..eb27ced476 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cut_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataLink.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataLink.svg new file mode 100644 index 0000000000..bc2a927b5d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataLink.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataLink_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataLink_disable.svg new file mode 100644 index 0000000000..89be86e4b6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataLink_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/datail_distable.svg b/designer-base/src/main/resources/com/fine/theme/icon/datail_distable.svg new file mode 100644 index 0000000000..0fefdfa57f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/datail_distable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off.svg new file mode 100755 index 0000000000..6f8804919f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off_disable.svg new file mode 100644 index 0000000000..9c2a3730b1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on.svg new file mode 100755 index 0000000000..fa45b2e20d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on_disable.svg new file mode 100644 index 0000000000..042c928afa --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/class_table_data.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/class_table_data.svg new file mode 100755 index 0000000000..e9d8a7d851 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/class_table_data.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/connection.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/connection.svg new file mode 100755 index 0000000000..6d45067212 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/connection.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/data_table.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/data_table.svg new file mode 100755 index 0000000000..d3137e6741 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/data_table.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/database.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/database.svg new file mode 100755 index 0000000000..5fd6afb17b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/database.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/database_warning.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/database_warning.svg new file mode 100644 index 0000000000..b9ab63749f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/database_warning.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit.svg new file mode 100755 index 0000000000..b43e5c10b5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit.svg @@ -0,0 +1,6 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit_disable.svg new file mode 100644 index 0000000000..409fe0d749 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/field.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/field.svg new file mode 100755 index 0000000000..ac7b5bd3ec --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/field.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/file.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/file.svg new file mode 100755 index 0000000000..969092dd91 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/file.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/multi.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/multi.svg new file mode 100755 index 0000000000..0f8eebe55c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/multi.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview.svg new file mode 100755 index 0000000000..a271d50876 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview_disable.svg new file mode 100644 index 0000000000..f663e9cbb4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database.svg new file mode 100755 index 0000000000..20fae8b6f2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database_warning.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database_warning.svg new file mode 100644 index 0000000000..a87767c3cc --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database_warning.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/store_procedure.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/store_procedure.svg new file mode 100755 index 0000000000..b1a15cb1c3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/store_procedure.svg @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/tree.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/tree.svg new file mode 100755 index 0000000000..9086b2a553 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/tree.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/default.svg b/designer-base/src/main/resources/com/fine/theme/icon/default.svg new file mode 100644 index 0000000000..d27d416384 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/default.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/detail.svg b/designer-base/src/main/resources/com/fine/theme/icon/detail.svg new file mode 100644 index 0000000000..b0ee53820b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/detail.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/digitalPlatform.svg b/designer-base/src/main/resources/com/fine/theme/icon/digitalPlatform.svg new file mode 100644 index 0000000000..ca248de1d4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/digitalPlatform.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dot.svg b/designer-base/src/main/resources/com/fine/theme/icon/dot.svg new file mode 100644 index 0000000000..c918d9a7eb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dot.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dot_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dot_disable.svg new file mode 100644 index 0000000000..906137d34a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dot_disable.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/down_arrow.svg b/designer-base/src/main/resources/com/fine/theme/icon/down_arrow.svg new file mode 100644 index 0000000000..1b2194ef08 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/down_arrow.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/down_arrow_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/down_arrow_disable.svg new file mode 100644 index 0000000000..d86909c30d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/down_arrow_disable.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/drag_left.svg b/designer-base/src/main/resources/com/fine/theme/icon/drag_left.svg new file mode 100644 index 0000000000..3908d661b3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/drag_left.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/drag_right.svg b/designer-base/src/main/resources/com/fine/theme/icon/drag_right.svg new file mode 100644 index 0000000000..8a825724ab --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/drag_right.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/bind_column_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/bind_column_popup.svg new file mode 100644 index 0000000000..bcd71fb0f2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/bind_column_popup.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/bind_column_popup_diable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/bind_column_popup_diable.svg new file mode 100644 index 0000000000..fc9d1026f1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/bind_column_popup_diable.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/cellelement_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/cellelement_popup.svg new file mode 100644 index 0000000000..c127f55106 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/cellelement_popup.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/cellelement_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/cellelement_popup_disable.svg new file mode 100644 index 0000000000..ebb08ad44a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/cellelement_popup_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/date_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/date_popup.svg new file mode 100644 index 0000000000..a2eb69bb6e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/date_popup.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/date_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/date_popup_disable.svg new file mode 100644 index 0000000000..e23f132741 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/date_popup_disable.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex.svg new file mode 100644 index 0000000000..2df8e391ac --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_disable.svg new file mode 100644 index 0000000000..dd0e39f792 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_popup.svg new file mode 100644 index 0000000000..a33796e5b2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_popup.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_popup_disable.svg new file mode 100644 index 0000000000..ce15b5e060 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_popup_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName.svg new file mode 100644 index 0000000000..22a4ad36ab --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_disable.svg new file mode 100644 index 0000000000..0abdef6e3c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_popup.svg new file mode 100644 index 0000000000..c3fc1f8340 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_popup.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_popup_disable.svg new file mode 100644 index 0000000000..979d386e8b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_popup_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/ds_column.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/ds_column.svg new file mode 100644 index 0000000000..f0b1cc1be4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/ds_column.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/ds_column_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/ds_column_disable.svg new file mode 100644 index 0000000000..d49305f380 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/ds_column_disable.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/param_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/param_popup.svg new file mode 100644 index 0000000000..c9b5eb0be4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/param_popup.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/param_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/param_popup_disable.svg new file mode 100644 index 0000000000..d149d239e3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/param_popup_disable.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean.svg new file mode 100644 index 0000000000..40abe4cfda --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_disable.svg new file mode 100644 index 0000000000..2b0ba115b2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_popup.svg new file mode 100644 index 0000000000..ee6835ce2e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_popup.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_popup_disable.svg new file mode 100644 index 0000000000..ac36746fb4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_popup_disable.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double.svg new file mode 100644 index 0000000000..65deb2864a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_disable.svg new file mode 100644 index 0000000000..ffd7070f02 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_popup.svg new file mode 100644 index 0000000000..0beab4511b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_popup.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_popup_disable.svg new file mode 100644 index 0000000000..460ea67827 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_popup_disable.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/expand/forbid.svg b/designer-base/src/main/resources/com/fine/theme/icon/expand/forbid.svg new file mode 100755 index 0000000000..7196cbd02f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/expand/forbid.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/expand/forbid_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/expand/forbid_disable.svg new file mode 100755 index 0000000000..9a161d213a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/expand/forbid_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/expand/horizontal.svg b/designer-base/src/main/resources/com/fine/theme/icon/expand/horizontal.svg new file mode 100755 index 0000000000..bce0ec62e2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/expand/horizontal.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/expand/horizontal_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/expand/horizontal_disable.svg new file mode 100755 index 0000000000..a5fa259837 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/expand/horizontal_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/expand/vertical.svg b/designer-base/src/main/resources/com/fine/theme/icon/expand/vertical.svg new file mode 100755 index 0000000000..52375c61c7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/expand/vertical.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/expand/vertical_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/expand/vertical_disable.svg new file mode 100755 index 0000000000..bbacb6db0f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/expand/vertical_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all.svg new file mode 100644 index 0000000000..d0040b8551 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all_disable.svg new file mode 100644 index 0000000000..ad625939c6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg new file mode 100644 index 0000000000..a97fbf9678 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg new file mode 100644 index 0000000000..632acdb4b6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_report.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_report.svg new file mode 100644 index 0000000000..ad9e75210d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_report.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_report_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_report_disable.svg new file mode 100644 index 0000000000..ef5d8748b8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_report_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_word.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_word.svg new file mode 100644 index 0000000000..6f9d1f6d6c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_word.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_word_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_word_disable.svg new file mode 100644 index 0000000000..ae6a0a3fa4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/add_word_disable.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/bmpFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/bmpFile.svg new file mode 100644 index 0000000000..01e6c412ae --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/bmpFile.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/bmpFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/bmpFile_disable.svg new file mode 100644 index 0000000000..16e2c4117f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/bmpFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/chtFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/chtFile.svg new file mode 100644 index 0000000000..2422bcf307 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/chtFile.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/chtFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/chtFile_disable.svg new file mode 100644 index 0000000000..abc7f19695 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/chtFile_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/classFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/classFile.svg new file mode 100644 index 0000000000..4fc380e73a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/classFile.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/classFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/classFile_disable.svg new file mode 100644 index 0000000000..ed15882e48 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/classFile_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/cpt_locked.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/cpt_locked.svg new file mode 100644 index 0000000000..18791ee41d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/cpt_locked.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/cpt_locked_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/cpt_locked_disable.svg new file mode 100644 index 0000000000..86a33a5c38 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/cpt_locked_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile.svg new file mode 100644 index 0000000000..6cce0ba0a7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_disable.svg new file mode 100644 index 0000000000..ede1cbc16a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg new file mode 100644 index 0000000000..6d0edf235f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/csvFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile.svg new file mode 100644 index 0000000000..5dd91fb6a7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_disable.svg new file mode 100644 index 0000000000..fc89982901 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg new file mode 100644 index 0000000000..fc6f27f422 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excelFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import.svg new file mode 100644 index 0000000000..2a21450f81 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_disable.svg new file mode 100644 index 0000000000..c4fdb4b49f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg new file mode 100644 index 0000000000..25e01eb8d6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/excel_import_white.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/flashFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/flashFile.svg new file mode 100644 index 0000000000..f1408b67f2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/flashFile.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/flashFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/flashFile_disable.svg new file mode 100644 index 0000000000..00d288d930 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/flashFile_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/frm_locked.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/frm_locked.svg new file mode 100644 index 0000000000..a602e102cb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/frm_locked.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/frm_locked_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/frm_locked_disable.svg new file mode 100644 index 0000000000..77eeb6f351 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/frm_locked_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/fvs_locked.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/fvs_locked.svg new file mode 100644 index 0000000000..1213c7fde6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/fvs_locked.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/gifFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/gifFile.svg new file mode 100644 index 0000000000..945e988e75 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/gifFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/gifFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/gifFile_disable.svg new file mode 100644 index 0000000000..b4e60659d4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/gifFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/htmlFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/htmlFile.svg new file mode 100644 index 0000000000..a593de1653 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/htmlFile.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/htmlFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/htmlFile_disable.svg new file mode 100644 index 0000000000..597eaadfa0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/htmlFile_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jarFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jarFile.svg new file mode 100644 index 0000000000..8cf93ffc01 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jarFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jarFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jarFile_disable.svg new file mode 100644 index 0000000000..a2b58b1e96 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jarFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/javaFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/javaFile.svg new file mode 100644 index 0000000000..185bc71a87 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/javaFile.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/javaFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/javaFile_disable.svg new file mode 100644 index 0000000000..7d94b54e8c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/javaFile_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jpgFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jpgFile.svg new file mode 100644 index 0000000000..0f0065ecf3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jpgFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jpgFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jpgFile_disable.svg new file mode 100644 index 0000000000..2a9c644837 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jpgFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jsFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jsFile.svg new file mode 100644 index 0000000000..596cac7d7c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jsFile.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jsFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jsFile_disable.svg new file mode 100644 index 0000000000..7777d71f41 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jsFile_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jspFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jspFile.svg new file mode 100644 index 0000000000..d029535ad9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jspFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jspFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jspFile_disable.svg new file mode 100644 index 0000000000..2d00642e09 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/jspFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile.svg new file mode 100644 index 0000000000..9ec5ffb81f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_disable.svg new file mode 100644 index 0000000000..bd3c767845 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg new file mode 100644 index 0000000000..476b988442 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pdfFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pngFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pngFile.svg new file mode 100644 index 0000000000..cf2cb0dd9b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pngFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pngFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pngFile_disable.svg new file mode 100644 index 0000000000..83adf9d2cd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/pngFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/sqlFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/sqlFile.svg new file mode 100644 index 0000000000..432938f062 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/sqlFile.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/sqlFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/sqlFile_disable.svg new file mode 100644 index 0000000000..3dedd47e58 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/sqlFile_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile.svg new file mode 100644 index 0000000000..639a7cea91 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_disable.svg new file mode 100644 index 0000000000..0ac3765b6d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg new file mode 100644 index 0000000000..0880cafed4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/templateFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/templateFile.svg new file mode 100644 index 0000000000..ef1d588c06 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/templateFile.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile.svg new file mode 100644 index 0000000000..21f0b95c04 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_disable.svg new file mode 100644 index 0000000000..122eceed9a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg new file mode 100644 index 0000000000..c02d60b003 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/txtFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile.svg new file mode 100644 index 0000000000..2ca4ef17f7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_disable.svg new file mode 100644 index 0000000000..c46e574960 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg new file mode 100644 index 0000000000..471fb62d88 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/wordFile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xlsFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xlsFile.svg new file mode 100644 index 0000000000..135b429b03 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xlsFile.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xlsFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xlsFile_disable.svg new file mode 100644 index 0000000000..687ed47b4b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xlsFile_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xmlFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xmlFile.svg new file mode 100644 index 0000000000..af5aecd593 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xmlFile.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xmlFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xmlFile_disable.svg new file mode 100644 index 0000000000..9257262130 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/xmlFile_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder.svg new file mode 100644 index 0000000000..4dd51d6ea1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder_open.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder_open.svg new file mode 100644 index 0000000000..c68e5c464b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder_open.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg new file mode 100644 index 0000000000..6a25d2b26c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg new file mode 100644 index 0000000000..4282709c39 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate.svg new file mode 100644 index 0000000000..de1e9e0032 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate_disable.svg new file mode 100644 index 0000000000..c21036aee8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/minus.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/minus.svg new file mode 100644 index 0000000000..75878fc8c2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/minus.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_copy.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_copy.svg new file mode 100755 index 0000000000..ef9dcf9c8e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_copy.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_copy_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_copy_disable.svg new file mode 100755 index 0000000000..2a9e24ddaf --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_copy_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_cut.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_cut.svg new file mode 100644 index 0000000000..15796db6be --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_cut.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_cut_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_cut_disable.svg new file mode 100644 index 0000000000..58fc5b4e70 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_cut_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_paste.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_paste.svg new file mode 100755 index 0000000000..ba3d92d61e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_paste.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_paste_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_paste_disable.svg new file mode 100755 index 0000000000..08caea5d7c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/monochrome_paste_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/move.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/move.svg new file mode 100755 index 0000000000..0e664e067c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/move.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/move_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/move_disable.svg new file mode 100755 index 0000000000..e7318afdee --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/move_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder.svg new file mode 100644 index 0000000000..1b6be8d0de --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder_disable.svg new file mode 100644 index 0000000000..0f80825179 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/plus.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/plus.svg new file mode 100644 index 0000000000..ca1e276691 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/plus.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh.svg new file mode 100644 index 0000000000..48b431577e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh_disable.svg new file mode 100644 index 0000000000..d54fdf70ad --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename.svg new file mode 100644 index 0000000000..7b47879915 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename_disable.svg new file mode 100644 index 0000000000..f5066f037b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list.svg new file mode 100644 index 0000000000..c21bbce647 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list_disable.svg new file mode 100644 index 0000000000..1fb00c82e7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder.svg new file mode 100644 index 0000000000..9781e5d2e2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder_disable.svg new file mode 100644 index 0000000000..0a89f2ef5c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/add_parenthesis.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/add_parenthesis.svg new file mode 100644 index 0000000000..fd415fcb5f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/add_parenthesis.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/add_parenthesis_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/add_parenthesis_disable.svg new file mode 100644 index 0000000000..ac60d55fe8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/add_parenthesis_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/background.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/background.svg new file mode 100755 index 0000000000..97929ef99d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/background.svg @@ -0,0 +1,6 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/bold.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/bold.svg new file mode 100644 index 0000000000..4aa1b6c071 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/bold.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/foreground.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/foreground.svg new file mode 100755 index 0000000000..d26f90872b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/foreground.svg @@ -0,0 +1,5 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/italic.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/italic.svg new file mode 100755 index 0000000000..3d53d5ffe8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/italic.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/remove_parenthesis.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/remove_parenthesis.svg new file mode 100644 index 0000000000..72c7c4ae3d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/remove_parenthesis.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/remove_parenthesis_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/remove_parenthesis_disable.svg new file mode 100644 index 0000000000..538bb9d9a5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/remove_parenthesis_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/shadow.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/shadow.svg new file mode 100644 index 0000000000..a543f20091 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/shadow.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/shadow_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/shadow_disable.svg new file mode 100644 index 0000000000..1db03fefab --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/shadow_disable.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/strike.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/strike.svg new file mode 100644 index 0000000000..36ea144a52 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/strike.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/strike_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/strike_disable.svg new file mode 100644 index 0000000000..77be0838e8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/strike_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/sub.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/sub.svg new file mode 100644 index 0000000000..71f1a3caa7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/sub.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/sub_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/sub_disable.svg new file mode 100644 index 0000000000..559755ab66 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/sub_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/super.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/super.svg new file mode 100644 index 0000000000..9ee840c36d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/super.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/super_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/super_disable.svg new file mode 100644 index 0000000000..4e07a44a80 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/super_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/underline.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/underline.svg new file mode 100755 index 0000000000..326f2fa6e0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/underline.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font_miss_check.svg b/designer-base/src/main/resources/com/fine/theme/icon/font_miss_check.svg new file mode 100644 index 0000000000..46125afd25 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font_miss_check.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font_miss_check_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font_miss_check_disable.svg new file mode 100644 index 0000000000..0bde37db4c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font_miss_check_disable.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/formatBrush.svg b/designer-base/src/main/resources/com/fine/theme/icon/formatBrush.svg new file mode 100644 index 0000000000..c1531fbed4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/formatBrush.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/formatBrush_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/formatBrush_disable.svg new file mode 100644 index 0000000000..f732f5b64d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/formatBrush_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/bias.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/bias.svg new file mode 100755 index 0000000000..179e845138 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/bias.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/bias_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/bias_disable.svg new file mode 100755 index 0000000000..63fd8e51b4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/bias_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/chart.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/chart.svg new file mode 100755 index 0000000000..f7ffe73362 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/chart.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/chart_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/chart_disable.svg new file mode 100755 index 0000000000..afddb9d68c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/chart_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/float_normal.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/float_normal.svg new file mode 100644 index 0000000000..b2204b711e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/float_normal.svg @@ -0,0 +1,7 @@ + + + icon_属性_悬浮元素_下拉列表用_normal + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/formula.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula.svg new file mode 100755 index 0000000000..948234b49c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula.svg @@ -0,0 +1,6 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_disable.svg new file mode 100755 index 0000000000..fe02e3020e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_disable.svg @@ -0,0 +1,6 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_popup.svg new file mode 100644 index 0000000000..f3a13f1e43 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_popup.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_popup_disable.svg new file mode 100644 index 0000000000..2516806535 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_popup_disable.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/image.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/image.svg new file mode 100755 index 0000000000..bb7fba99a7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/image.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/image_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/image_disable.svg new file mode 100755 index 0000000000..b9be9b7db5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/image_disable.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext.svg new file mode 100755 index 0000000000..5b9a833059 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext_disable.svg new file mode 100755 index 0000000000..2e8c92ed2a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext_disable.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report.svg new file mode 100755 index 0000000000..14f0555a9a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report_disable.svg new file mode 100755 index 0000000000..377745a5a2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report_disable.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/text.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/text.svg new file mode 100755 index 0000000000..219db75d15 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/text.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/text_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/text_disable.svg new file mode 100755 index 0000000000..0c37c6af50 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/text_disable.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/jumpHelp.svg b/designer-base/src/main/resources/com/fine/theme/icon/jumpHelp.svg new file mode 100644 index 0000000000..192bdfff9a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/jumpHelp.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/jumpHelp_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/jumpHelp_disable.svg new file mode 100644 index 0000000000..93e997128b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/jumpHelp_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_bottom.svg b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_bottom.svg new file mode 100644 index 0000000000..1e0d3d2418 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_bottom.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_left.svg b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_left.svg new file mode 100644 index 0000000000..b891f37140 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_left.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_right.svg b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_right.svg new file mode 100644 index 0000000000..ae8be3dd5f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_right.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_top.svg b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_top.svg new file mode 100644 index 0000000000..7e61c5d786 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_top.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_top_right.svg b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_top_right.svg new file mode 100644 index 0000000000..59bdc90a82 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/layout/layout_top_right.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/lock/locked.svg b/designer-base/src/main/resources/com/fine/theme/icon/lock/locked.svg new file mode 100644 index 0000000000..1a1e90b76a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/lock/locked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/lock/locked_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/lock/locked_disable.svg new file mode 100644 index 0000000000..70fdd16dec --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/lock/locked_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/lock/unlocked.svg b/designer-base/src/main/resources/com/fine/theme/icon/lock/unlocked.svg new file mode 100644 index 0000000000..1117d1fa7c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/lock/unlocked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/lock/unlocked_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/lock/unlocked_disable.svg new file mode 100644 index 0000000000..d2f7e40651 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/lock/unlocked_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg.svg b/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg.svg new file mode 100755 index 0000000000..f6bafda5ca --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_disable.svg new file mode 100755 index 0000000000..037846556c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_dot.svg b/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_dot.svg new file mode 100755 index 0000000000..7d89dafebe --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_dot.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_dot_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_dot_disable.svg new file mode 100755 index 0000000000..9354463b17 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/log/logMsg_dot_disable.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/logo.svg b/designer-base/src/main/resources/com/fine/theme/icon/logo.svg new file mode 100644 index 0000000000..eb0f0815d4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/logo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/merge/merge.svg b/designer-base/src/main/resources/com/fine/theme/icon/merge/merge.svg new file mode 100755 index 0000000000..b6cd00a087 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/merge/merge.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/merge/merge_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/merge/merge_disable.svg new file mode 100755 index 0000000000..b2cb85a43b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/merge/merge_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge.svg b/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge.svg new file mode 100755 index 0000000000..5ba0599225 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge_disable.svg new file mode 100755 index 0000000000..7917ebc5fb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/noboder.svg b/designer-base/src/main/resources/com/fine/theme/icon/noboder.svg new file mode 100755 index 0000000000..1fc34c6b0c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/noboder.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/notification/notification.svg b/designer-base/src/main/resources/com/fine/theme/icon/notification/notification.svg new file mode 100755 index 0000000000..bebe1dd1f7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/notification/notification.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/notification/notification_dot.svg b/designer-base/src/main/resources/com/fine/theme/icon/notification/notification_dot.svg new file mode 100755 index 0000000000..33d3241e61 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/notification/notification_dot.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/pageQuery.svg b/designer-base/src/main/resources/com/fine/theme/icon/pageQuery.svg new file mode 100644 index 0000000000..4b0ee94ec5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/pageQuery.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/edit.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/edit.svg new file mode 100644 index 0000000000..18e92aecfb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/edit.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/edit_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/edit_disable.svg new file mode 100644 index 0000000000..09f0d2e49a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/edit_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/edit_pressed.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/edit_pressed.svg new file mode 100644 index 0000000000..31196d10d7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/edit_pressed.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/hide.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/hide.svg new file mode 100644 index 0000000000..11dfc10b36 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/hide.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/hide_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/hide_disable.svg new file mode 100644 index 0000000000..73a27ff478 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/hide_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/hide_pressed.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/hide_pressed.svg new file mode 100644 index 0000000000..2aaf53a1d9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/hide_pressed.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/param.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/param.svg new file mode 100644 index 0000000000..cf8c4954e6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/param.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/param_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/param_disable.svg new file mode 100644 index 0000000000..33f424067f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/param_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/view.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/view.svg new file mode 100644 index 0000000000..8a44f28058 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/view.svg @@ -0,0 +1,7 @@ + + + icon 显示 + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/view_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/view_disable.svg new file mode 100644 index 0000000000..00d8bbe403 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/view_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/view_pressed.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/view_pressed.svg new file mode 100644 index 0000000000..04a70dd037 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/param/view_pressed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/paste.svg b/designer-base/src/main/resources/com/fine/theme/icon/paste.svg new file mode 100644 index 0000000000..d520164fb6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/paste.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/paste_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/paste_disable.svg new file mode 100644 index 0000000000..076509580d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/paste_disable.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/popup/collapse_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/popup/collapse_popup.svg new file mode 100644 index 0000000000..71d013dd4c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/popup/collapse_popup.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/popup/expand_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/popup/expand_popup.svg new file mode 100755 index 0000000000..91bd6153c1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/popup/expand_popup.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/popup/popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/popup/popup.svg new file mode 100755 index 0000000000..b513a4de7f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/popup/popup.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/preview/data_analysis.svg b/designer-base/src/main/resources/com/fine/theme/icon/preview/data_analysis.svg new file mode 100644 index 0000000000..aeb08470bb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/preview/data_analysis.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/preview/data_analysis_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/preview/data_analysis_disable.svg new file mode 100644 index 0000000000..121e83b7d7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/preview/data_analysis_disable.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_mobile.svg b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_mobile.svg new file mode 100644 index 0000000000..09ddf6647b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_mobile.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_mobile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_mobile_disable.svg new file mode 100644 index 0000000000..0e54c95410 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_mobile_disable.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_paging.svg b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_paging.svg new file mode 100644 index 0000000000..071efca7ef --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_paging.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_paging_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_paging_disable.svg new file mode 100644 index 0000000000..0eb39556ab --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_paging_disable.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_write.svg b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_write.svg new file mode 100644 index 0000000000..546387326d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_write.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_write_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_write_disable.svg new file mode 100644 index 0000000000..2719a5b546 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/preview/preview_write_disable.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/previewSql.svg b/designer-base/src/main/resources/com/fine/theme/icon/previewSql.svg new file mode 100644 index 0000000000..0dd74b8af5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/previewSql.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit.svg new file mode 100644 index 0000000000..4874792684 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit_disabled.svg new file mode 100644 index 0000000000..bb6246b1e6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit_disabled.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit_selected.svg new file mode 100644 index 0000000000..a5883d9c60 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/authorityedit_selected.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr.svg new file mode 100644 index 0000000000..cfb36fc85d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr_disabled.svg new file mode 100644 index 0000000000..a1150442f7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr_disabled.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr_selected.svg new file mode 100644 index 0000000000..17706fc98d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellattr_selected.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement.svg new file mode 100644 index 0000000000..e152ee4c18 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement_disabled.svg new file mode 100644 index 0000000000..0aafcc1d1c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement_disabled.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement_selected.svg new file mode 100644 index 0000000000..cb613c2c1f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/cellelement_selected.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr.svg new file mode 100644 index 0000000000..d0497406f7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr_disabled.svg new file mode 100644 index 0000000000..7c5064a191 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr_disabled.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr_selected.svg new file mode 100644 index 0000000000..9a85985534 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/conditionattr_selected.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles.svg new file mode 100644 index 0000000000..637214022f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles_disabled.svg new file mode 100644 index 0000000000..31455704fc --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles_disabled.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles_selected.svg new file mode 100644 index 0000000000..dde6ad86ed --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/configuredroles_selected.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement.svg new file mode 100644 index 0000000000..4ef1ef8734 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_disabled.svg new file mode 100644 index 0000000000..0c8a5296ed --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_disabled.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_popup.svg new file mode 100644 index 0000000000..c5febced52 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_popup.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_popup_disable.svg new file mode 100644 index 0000000000..e0d55fca02 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_popup_disable.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_selected.svg new file mode 100644 index 0000000000..1cbe48bfb2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_selected.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink.svg new file mode 100644 index 0000000000..474c6e9fa8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink_disabled.svg new file mode 100644 index 0000000000..ea0b21353a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink_disabled.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink_selected.svg new file mode 100644 index 0000000000..582f97a227 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/hyperlink_selected.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib.svg new file mode 100644 index 0000000000..ff3df716ed --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib_disabled.svg new file mode 100644 index 0000000000..cd65358eda --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib_disabled.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib_selected.svg new file mode 100644 index 0000000000..d27dbe70d4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetlib_selected.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings.svg new file mode 100644 index 0000000000..1ed6e9fa32 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings_disabled.svg new file mode 100644 index 0000000000..7cd626f1c5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings_disabled.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings_selected.svg new file mode 100644 index 0000000000..04168614f9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/propertiestab/widgetsettings_selected.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/radio/radio_selected.svg b/designer-base/src/main/resources/com/fine/theme/icon/radio/radio_selected.svg new file mode 100644 index 0000000000..c80d9475ec --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/radio/radio_selected.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/radio/radio_unselected.svg b/designer-base/src/main/resources/com/fine/theme/icon/radio/radio_unselected.svg new file mode 100644 index 0000000000..f5d61b7597 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/radio/radio_unselected.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/recycle.svg b/designer-base/src/main/resources/com/fine/theme/icon/recycle.svg new file mode 100644 index 0000000000..ab3b97e703 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/recycle.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/redo.svg b/designer-base/src/main/resources/com/fine/theme/icon/redo.svg new file mode 100644 index 0000000000..5fa4361cfe --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/redo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/redo_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/redo_disable.svg new file mode 100644 index 0000000000..42adaa3271 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/redo_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/remove.svg b/designer-base/src/main/resources/com/fine/theme/icon/remove.svg new file mode 100755 index 0000000000..760055c5e2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/remove.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/remove_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/remove_disable.svg new file mode 100644 index 0000000000..927064446e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/remove_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/run.svg b/designer-base/src/main/resources/com/fine/theme/icon/run.svg new file mode 100644 index 0000000000..6540642f83 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/run.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/run_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/run_disable.svg new file mode 100644 index 0000000000..28768b617e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/run_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/run_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/run_white.svg new file mode 100644 index 0000000000..2502883512 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/run_white.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/save.svg b/designer-base/src/main/resources/com/fine/theme/icon/save.svg new file mode 100644 index 0000000000..469a1a61b0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/save.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/saveFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/saveFile.svg new file mode 100644 index 0000000000..6da83ea77d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/saveFile.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/saveFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/saveFile_disable.svg new file mode 100644 index 0000000000..cdc9c4b08d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/saveFile_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/save_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/save_disable.svg new file mode 100644 index 0000000000..1085e2bb0c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/save_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/search.svg b/designer-base/src/main/resources/com/fine/theme/icon/search.svg new file mode 100644 index 0000000000..b04adf27f1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/search.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/search_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/search_disable.svg new file mode 100644 index 0000000000..982bbe7687 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/search_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/select.svg b/designer-base/src/main/resources/com/fine/theme/icon/select.svg new file mode 100644 index 0000000000..7eb7a4ee49 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/select.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/select_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/select_disable.svg new file mode 100644 index 0000000000..9a9ab1d2b2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/select_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg new file mode 100644 index 0000000000..c8584f2d92 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg new file mode 100644 index 0000000000..1a1b3f47d5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_frm_disable.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg new file mode 100644 index 0000000000..c860d75b47 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg new file mode 100644 index 0000000000..8f5cb4ec9e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sheet/add_sheet_disable.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/nosort.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/nosort.svg new file mode 100644 index 0000000000..a23aaa88b9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/nosort.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/sort_asc.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/sort_asc.svg new file mode 100644 index 0000000000..a91d507015 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/sort_asc.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/sort_desc.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/sort_desc.svg new file mode 100644 index 0000000000..cb9b5d390e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/fill/sort_desc.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/nosort.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/nosort.svg new file mode 100644 index 0000000000..29fdee5e28 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/nosort.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/nosort_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/nosort_disable.svg new file mode 100644 index 0000000000..446eb9106f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/nosort_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_asc.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_asc.svg new file mode 100644 index 0000000000..31d9cac71e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_asc.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_asc_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_asc_disable.svg new file mode 100644 index 0000000000..2b7f11e789 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_asc_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_desc.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_desc.svg new file mode 100644 index 0000000000..b6293907a6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_desc.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_desc_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_desc_disable.svg new file mode 100644 index 0000000000..81bc040940 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/sort/sort_desc_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/startup/local_server_background.svg b/designer-base/src/main/resources/com/fine/theme/icon/startup/local_server_background.svg new file mode 100644 index 0000000000..f4fbedca90 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/startup/local_server_background.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/startup/more.svg b/designer-base/src/main/resources/com/fine/theme/icon/startup/more.svg new file mode 100755 index 0000000000..65f7b7c701 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/startup/more.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/startup/more_hover.svg b/designer-base/src/main/resources/com/fine/theme/icon/startup/more_hover.svg new file mode 100644 index 0000000000..5b4ee1d6fd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/startup/more_hover.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/startup/remote_server_background.svg b/designer-base/src/main/resources/com/fine/theme/icon/startup/remote_server_background.svg new file mode 100644 index 0000000000..7313efc9c4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/startup/remote_server_background.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/startup/show_less.svg b/designer-base/src/main/resources/com/fine/theme/icon/startup/show_less.svg new file mode 100755 index 0000000000..b929630e7f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/startup/show_less.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/startup/show_more.svg b/designer-base/src/main/resources/com/fine/theme/icon/startup/show_more.svg new file mode 100755 index 0000000000..1b7c059d97 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/startup/show_more.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/switch.svg b/designer-base/src/main/resources/com/fine/theme/icon/switch.svg new file mode 100644 index 0000000000..7fa83df944 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/switch.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/tables.svg b/designer-base/src/main/resources/com/fine/theme/icon/tables.svg new file mode 100644 index 0000000000..dd13c2e491 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/tables.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/template_theme.svg b/designer-base/src/main/resources/com/fine/theme/icon/template_theme.svg new file mode 100644 index 0000000000..48a11990d9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/template_theme.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/template_theme_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/template_theme_disable.svg new file mode 100644 index 0000000000..94a01fa74d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/template_theme_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/time.svg b/designer-base/src/main/resources/com/fine/theme/icon/time.svg new file mode 100644 index 0000000000..41774b3bdb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/time.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/tip/error.svg b/designer-base/src/main/resources/com/fine/theme/icon/tip/error.svg new file mode 100644 index 0000000000..1b372e81db --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/tip/error.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/tip/information.svg b/designer-base/src/main/resources/com/fine/theme/icon/tip/information.svg new file mode 100644 index 0000000000..3ee949564e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/tip/information.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/tip/new_information.svg b/designer-base/src/main/resources/com/fine/theme/icon/tip/new_information.svg new file mode 100644 index 0000000000..42825bc9b1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/tip/new_information.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/tip/success.svg b/designer-base/src/main/resources/com/fine/theme/icon/tip/success.svg new file mode 100644 index 0000000000..3c4fb4d703 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/tip/success.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/tip/warning.svg b/designer-base/src/main/resources/com/fine/theme/icon/tip/warning.svg new file mode 100644 index 0000000000..f8086fbdf2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/tip/warning.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter.svg new file mode 100644 index 0000000000..9c01e5ff5e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter_disable.svg new file mode 100644 index 0000000000..d5fa0e46d9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/add_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/add_popup.svg new file mode 100644 index 0000000000..3c3bbffb36 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/add_popup.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/add_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/add_popup_disable.svg new file mode 100644 index 0000000000..47c769a580 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/add_popup_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit.svg new file mode 100644 index 0000000000..f44b579ef3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit_disable.svg new file mode 100644 index 0000000000..8dcd677a45 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit_disable.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/appendRow.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/appendRow.svg new file mode 100644 index 0000000000..953db77f69 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/appendRow.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/appendRow_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/appendRow_disable.svg new file mode 100644 index 0000000000..b28d2f9478 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/appendRow_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/append_column.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/append_column.svg new file mode 100644 index 0000000000..2d46946d0f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/append_column.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/append_row.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/append_row.svg new file mode 100644 index 0000000000..34a5f0848d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/append_row.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs.svg new file mode 100644 index 0000000000..bcbb7bb33d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs_disable.svg new file mode 100644 index 0000000000..d0d531f1d8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bracket.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bracket.svg new file mode 100644 index 0000000000..fd415fcb5f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bracket.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bracket_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bracket_disable.svg new file mode 100644 index 0000000000..ac60d55fe8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bracket_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug.svg new file mode 100644 index 0000000000..9ea08d02b7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug_disable.svg new file mode 100644 index 0000000000..480a46eb13 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData.svg new file mode 100644 index 0000000000..48a36d6be2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData_disable.svg new file mode 100644 index 0000000000..5483d0537e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData_disable.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle.svg new file mode 100644 index 0000000000..578ad9d1ce --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle_disable.svg new file mode 100644 index 0000000000..03fc5da621 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle.svg new file mode 100644 index 0000000000..c84bcb704b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle_disable.svg new file mode 100644 index 0000000000..3018bf1999 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle_disable.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/clearStash.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/clearStash.svg new file mode 100644 index 0000000000..1c1214522d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/clearStash.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/clearStash_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/clearStash_disable.svg new file mode 100644 index 0000000000..6d62bdb21a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/clearStash_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/config.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/config.svg new file mode 100644 index 0000000000..f93629147c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/config.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/config_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/config_disable.svg new file mode 100644 index 0000000000..28b5444d6a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/config_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/copy.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/copy.svg new file mode 100644 index 0000000000..e972efa49f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/copy.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/copy_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/copy_disable.svg new file mode 100644 index 0000000000..bc5d341caa --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/copy_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt.svg new file mode 100644 index 0000000000..ef1d588c06 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt_disable.svg new file mode 100644 index 0000000000..d1eeea5d78 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg new file mode 100644 index 0000000000..4788ae82df --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg new file mode 100644 index 0000000000..2632e8f5be --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFrm_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg new file mode 100644 index 0000000000..469b60e2cf --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg new file mode 100644 index 0000000000..cad5f2e720 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createFvs_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther.svg new file mode 100755 index 0000000000..4b84498db3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther_disable.svg new file mode 100755 index 0000000000..a31ec72292 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther_disable.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/customButton.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/customButton.svg new file mode 100644 index 0000000000..af4281adf2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/customButton.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/customButton_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/customButton_disable.svg new file mode 100644 index 0000000000..28c9902293 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/customButton_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/dataVerify.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/dataVerify.svg new file mode 100644 index 0000000000..6cfda99d8a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/dataVerify.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/dataVerify_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/dataVerify_disable.svg new file mode 100644 index 0000000000..6672c764ea --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/dataVerify_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource.svg new file mode 100644 index 0000000000..85f677a337 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource_disable.svg new file mode 100644 index 0000000000..9da578a790 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/deleteRow.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/deleteRow.svg new file mode 100644 index 0000000000..d328022023 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/deleteRow.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/deleteRow_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/deleteRow_disable.svg new file mode 100644 index 0000000000..3d952d2b18 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/deleteRow_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/delete_column.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/delete_column.svg new file mode 100644 index 0000000000..b82d7e9503 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/delete_column.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/delete_row.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/delete_row.svg new file mode 100644 index 0000000000..7283f31c7c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/delete_row.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo.svg new file mode 100644 index 0000000000..40cbc7f35a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo_disable.svg new file mode 100644 index 0000000000..70a51ebc32 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit.svg new file mode 100644 index 0000000000..46522e6fa4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit_disable.svg new file mode 100644 index 0000000000..9af18392d7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit_white.svg new file mode 100644 index 0000000000..f8147ee0dd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/edit_white.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/email.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/email.svg new file mode 100644 index 0000000000..13b48174b7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/email.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/email_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/email_disable.svg new file mode 100644 index 0000000000..74499db085 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/email_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect.svg new file mode 100644 index 0000000000..ca309348c8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect_disable.svg new file mode 100644 index 0000000000..47ec58aba5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export.svg new file mode 100644 index 0000000000..6c14b39d27 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export_disable.svg new file mode 100644 index 0000000000..7a15aff7c9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter.svg new file mode 100644 index 0000000000..72603f8e82 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_disable.svg new file mode 100644 index 0000000000..ec36c9d5cc --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_popup.svg new file mode 100644 index 0000000000..e294913b77 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_popup.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_popup_disable.svg new file mode 100644 index 0000000000..2b0ef959ff --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_popup_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager.svg new file mode 100644 index 0000000000..95debb410a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager_disable.svg new file mode 100644 index 0000000000..c9a7a037f7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help.svg new file mode 100644 index 0000000000..53344f0633 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help_disable.svg new file mode 100644 index 0000000000..6093ac8b77 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr.svg new file mode 100644 index 0000000000..a2b6d3611c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr_disable.svg new file mode 100644 index 0000000000..d5d2f90cbb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg new file mode 100644 index 0000000000..a5f4c9fb1d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg new file mode 100644 index 0000000000..28c7f70f97 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/localConnect_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr.svg new file mode 100644 index 0000000000..fde8b271b7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr_disable.svg new file mode 100644 index 0000000000..f3a4148cc7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase.svg new file mode 100644 index 0000000000..d4faa9d930 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase_disable.svg new file mode 100644 index 0000000000..9ac86f3182 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo.svg new file mode 100644 index 0000000000..248d6dcde5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo_disable.svg new file mode 100644 index 0000000000..86bc5fa285 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo.svg new file mode 100644 index 0000000000..56757baec7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo_disable.svg new file mode 100644 index 0000000000..fb28a62cbf --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more.svg new file mode 100644 index 0000000000..42f49767c8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_disable.svg new file mode 100644 index 0000000000..6570607cd1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_hover.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_hover.svg new file mode 100644 index 0000000000..5ffca66be2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/more_hover.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_down.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_down.svg new file mode 100644 index 0000000000..2bee4b2d77 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_down.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_down_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_down_disable.svg new file mode 100644 index 0000000000..832e2d7ddc --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_down_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_left.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_left.svg new file mode 100644 index 0000000000..06f6281974 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_left.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_left_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_left_disable.svg new file mode 100644 index 0000000000..49c273bddd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_left_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_right.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_right.svg new file mode 100644 index 0000000000..9e6d66b5d6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_right.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_right_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_right_disable.svg new file mode 100644 index 0000000000..cb8ebd753d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_right_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_up.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_up.svg new file mode 100644 index 0000000000..df2a4fcb0a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_up.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_up_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_up_disable.svg new file mode 100644 index 0000000000..2b6c72634e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_up_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need.svg new file mode 100644 index 0000000000..e6af95c670 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need_disable.svg new file mode 100644 index 0000000000..4130bdb0d7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need_disable.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/newLine.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/newLine.svg new file mode 100644 index 0000000000..6236b57ed3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/newLine.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate.svg new file mode 100644 index 0000000000..5f4af68e47 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate_disable.svg new file mode 100644 index 0000000000..5a304c7bcd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page.svg new file mode 100644 index 0000000000..6ba88c97d1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup.svg new file mode 100644 index 0000000000..72fa857c3b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup_disable.svg new file mode 100644 index 0000000000..1f23b45f32 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_first.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_first.svg new file mode 100644 index 0000000000..ac5c1f0c12 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_first.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_first_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_first_disable.svg new file mode 100644 index 0000000000..f7e6a77895 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_first_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_last.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_last.svg new file mode 100644 index 0000000000..7f14b98388 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_last.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_last_disbale.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_last_disbale.svg new file mode 100644 index 0000000000..80384418da --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_last_disbale.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_navi.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_navi.svg new file mode 100644 index 0000000000..afc2ecb557 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_navi.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_navi_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_navi_disable.svg new file mode 100644 index 0000000000..365e6dc5fa --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_navi_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_next.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_next.svg new file mode 100644 index 0000000000..12c49708d8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_next.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_next_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_next_disable.svg new file mode 100644 index 0000000000..f1ac806195 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_next_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_previous.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_previous.svg new file mode 100644 index 0000000000..37df1e9546 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_previous.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_previous_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_previous_disable.svg new file mode 100644 index 0000000000..e53a285ed6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/page_previous_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pages.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pages.svg new file mode 100644 index 0000000000..8df4d04b25 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pages.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform.svg new file mode 100644 index 0000000000..743829f741 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform_disable.svg new file mode 100644 index 0000000000..873fb9f4d1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager.svg new file mode 100644 index 0000000000..3d637f7a96 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager_disable.svg new file mode 100644 index 0000000000..afcb393ba9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager_disable.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print.svg new file mode 100755 index 0000000000..802cd701d6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printApplet.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printApplet.svg new file mode 100644 index 0000000000..ddf8873655 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printApplet.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printApplet_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printApplet_disable.svg new file mode 100644 index 0000000000..4dd13115b8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printApplet_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPdf.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPdf.svg new file mode 100644 index 0000000000..405640d101 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPdf.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPdf_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPdf_disable.svg new file mode 100644 index 0000000000..0044218667 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPdf_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPreview.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPreview.svg new file mode 100644 index 0000000000..479384b117 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPreview.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPreview_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPreview_disable.svg new file mode 100644 index 0000000000..b3b7dce3df --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printPreview_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print_disable.svg new file mode 100755 index 0000000000..f4023c9788 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print_disable.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printerOffset.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printerOffset.svg new file mode 100644 index 0000000000..90d01097be --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printerOffset.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printerOffset_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printerOffset_disable.svg new file mode 100644 index 0000000000..0eb451e6f1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/printerOffset_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question.svg new file mode 100644 index 0000000000..8fe8f7fa18 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question_disable.svg new file mode 100644 index 0000000000..3bb377af34 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question_disable.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg new file mode 100644 index 0000000000..fba1189606 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg new file mode 100644 index 0000000000..edca32a272 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteConnect_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg new file mode 100644 index 0000000000..7c55d8adef --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg new file mode 100644 index 0000000000..f5c4ab3675 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/remoteDesignAuthManager_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen.svg new file mode 100644 index 0000000000..057f0d46df --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen_disable.svg new file mode 100644 index 0000000000..23db4a9bce --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace.svg new file mode 100644 index 0000000000..4ce772e3da --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace_disable.svg new file mode 100644 index 0000000000..2b1513242c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground.svg new file mode 100644 index 0000000000..a37d52aefd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground_disable.svg new file mode 100644 index 0000000000..76bfd4103b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr.svg new file mode 100644 index 0000000000..c663fe3ce0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr_disable.svg new file mode 100644 index 0000000000..c6b016fa49 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr_disable.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit.svg new file mode 100644 index 0000000000..dfb5b3c9c9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit_disable.svg new file mode 100644 index 0000000000..5e0b16c39f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter.svg new file mode 100755 index 0000000000..0cf7ba674d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter_disable.svg new file mode 100755 index 0000000000..c47e8346d2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter_disable.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader.svg new file mode 100755 index 0000000000..483fa79587 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader_disable.svg new file mode 100755 index 0000000000..704fe328fa --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader_disable.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter.svg new file mode 100644 index 0000000000..423882917c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter_disable.svg new file mode 100644 index 0000000000..c4fed0bf28 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter_disable.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr.svg new file mode 100644 index 0000000000..2e39e4e9ee --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr_disable.svg new file mode 100644 index 0000000000..ab1ecde62a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs.svg new file mode 100644 index 0000000000..c3a40df4e7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs_disable.svg new file mode 100644 index 0000000000..4b78d6919d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/scale.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/scale.svg new file mode 100644 index 0000000000..fd9b1ba386 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/scale.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/scale_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/scale_disable.svg new file mode 100644 index 0000000000..d51fced4d0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/scale_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/selectedAll.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/selectedAll.svg new file mode 100644 index 0000000000..64350dc681 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/selectedAll.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager.svg new file mode 100644 index 0000000000..36123b2b85 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager_disable.svg new file mode 100644 index 0000000000..5d1803122c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager_disable.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform.svg new file mode 100755 index 0000000000..28581feee0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform_disable.svg new file mode 100755 index 0000000000..be8bc822b3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/servicePlatform_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/showValue.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/showValue.svg new file mode 100644 index 0000000000..5b1429fc2e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/showValue.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/showValue_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/showValue_disable.svg new file mode 100644 index 0000000000..309252f6df --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/showValue_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign.svg new file mode 100644 index 0000000000..434ec48152 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign_disable.svg new file mode 100644 index 0000000000..1ea6b13052 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution.svg new file mode 100644 index 0000000000..09b8b3f297 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution_disable.svg new file mode 100644 index 0000000000..60491f447d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/stash.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/stash.svg new file mode 100644 index 0000000000..93bc93a173 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/stash.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/stash_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/stash_disable.svg new file mode 100644 index 0000000000..59cd126696 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/stash_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan.svg new file mode 100644 index 0000000000..19b01795a4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan_disable.svg new file mode 100644 index 0000000000..1a1640ad33 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv.svg new file mode 100644 index 0000000000..1aabb99ff3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv_disable.svg new file mode 100644 index 0000000000..5edb4eacd5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore.svg new file mode 100644 index 0000000000..bfedf499d9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore_disable.svg new file mode 100644 index 0000000000..d37287b27a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg new file mode 100644 index 0000000000..171d7da1e9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg new file mode 100644 index 0000000000..acb876ae38 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg new file mode 100644 index 0000000000..c22307dd6d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateThemeManager_white.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_bottom.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_bottom.svg new file mode 100644 index 0000000000..e469901e05 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_bottom.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_bottom_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_bottom_disable.svg new file mode 100644 index 0000000000..6c6fd6e02c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_bottom_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_top.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_top.svg new file mode 100644 index 0000000000..2fd47003f0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_top.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_top_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_top_disable.svg new file mode 100644 index 0000000000..7233c0934d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/to_top_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/unBracket.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/unBracket.svg new file mode 100644 index 0000000000..6bb05f7c89 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/unBracket.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/unBracket_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/unBracket_disable.svg new file mode 100644 index 0000000000..f9b651d80c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/unBracket_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update.svg new file mode 100644 index 0000000000..6430a6bcf2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update_disable.svg new file mode 100644 index 0000000000..c69a417f9b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video.svg new file mode 100644 index 0000000000..6b83ecc90c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video_disable.svg new file mode 100644 index 0000000000..f0bd8cd911 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video_disable.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark.svg new file mode 100644 index 0000000000..9b314c514c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark_disable.svg new file mode 100644 index 0000000000..725c4b10ea --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute.svg new file mode 100644 index 0000000000..f132dd570c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute_disable.svg new file mode 100644 index 0000000000..318c15f130 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager.svg new file mode 100644 index 0000000000..c919716b53 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager_disable.svg new file mode 100644 index 0000000000..271256d571 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager_disable.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu.svg new file mode 100644 index 0000000000..359597af47 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu_disable.svg new file mode 100644 index 0000000000..0f87deeaf4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu_disable.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter.svg new file mode 100644 index 0000000000..4fc373159e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter_disable.svg new file mode 100644 index 0000000000..471d7c5cad --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_down.svg b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_down.svg new file mode 100755 index 0000000000..7a0d1e3443 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_down.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_down_small.svg b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_down_small.svg new file mode 100755 index 0000000000..b513a4de7f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_down_small.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_left.svg b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_left.svg new file mode 100755 index 0000000000..0e9c0637ba --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_left.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_left_small.svg b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_left_small.svg new file mode 100755 index 0000000000..7307860955 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_left_small.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_right.svg b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_right.svg new file mode 100755 index 0000000000..cfdd78d161 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_right.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_right_small.svg b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_right_small.svg new file mode 100755 index 0000000000..af6ac0335a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/triangle/triangle_right_small.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/undo.svg b/designer-base/src/main/resources/com/fine/theme/icon/undo.svg new file mode 100644 index 0000000000..6a76ee0b67 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/undo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/undo_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/undo_disable.svg new file mode 100644 index 0000000000..4e186ac0a7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/undo_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/up_arrow.svg b/designer-base/src/main/resources/com/fine/theme/icon/up_arrow.svg new file mode 100755 index 0000000000..1922f057fa --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/up_arrow.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/up_arrow_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/up_arrow_disable.svg new file mode 100755 index 0000000000..ba24338cf1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/up_arrow_disable.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/variable/dataItem.svg b/designer-base/src/main/resources/com/fine/theme/icon/variable/dataItem.svg new file mode 100644 index 0000000000..bd565d58c8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/variable/dataItem.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/variable/dataItem_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/variable/dataItem_disable.svg new file mode 100644 index 0000000000..faaba60788 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/variable/dataItem_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/variable/param_global.svg b/designer-base/src/main/resources/com/fine/theme/icon/variable/param_global.svg new file mode 100644 index 0000000000..b40cfa16b1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/variable/param_global.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/variable/param_global_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/variable/param_global_disable.svg new file mode 100644 index 0000000000..bb283b3f54 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/variable/param_global_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/variable/variable.svg b/designer-base/src/main/resources/com/fine/theme/icon/variable/variable.svg new file mode 100644 index 0000000000..b1694b5a14 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/variable/variable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/variable/variable_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/variable/variable_disable.svg new file mode 100644 index 0000000000..828e64f724 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/variable/variable_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/version_save.svg b/designer-base/src/main/resources/com/fine/theme/icon/version_save.svg new file mode 100644 index 0000000000..3e7f6e1141 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/version_save.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/version_save_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/version_save_disable.svg new file mode 100644 index 0000000000..4251f6a911 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/version_save_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/views.svg b/designer-base/src/main/resources/com/fine/theme/icon/views.svg new file mode 100644 index 0000000000..3e4fe18362 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/views.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components.svg new file mode 100644 index 0000000000..8bea108a5a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components_disable.svg new file mode 100644 index 0000000000..49cc4a0b8a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components_disable.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/button.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/button.svg new file mode 100644 index 0000000000..4bbdbe9cbb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/button.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/button_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/button_disable.svg new file mode 100644 index 0000000000..37b41b3640 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/button_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/button_group.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/button_group.svg new file mode 100644 index 0000000000..ed74e90966 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/button_group.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/button_group_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/button_group_disable.svg new file mode 100644 index 0000000000..c4c7f1d97f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/button_group_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox.svg new file mode 100644 index 0000000000..bd379ea23d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_disable.svg new file mode 100644 index 0000000000..be8f4bab16 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_group.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_group.svg new file mode 100644 index 0000000000..a06b362359 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_group.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_group_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_group_disable.svg new file mode 100644 index 0000000000..caa279ab06 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/checkbox_group_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_box.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_box.svg new file mode 100644 index 0000000000..2e7643d633 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_box.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_box_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_box_disable.svg new file mode 100644 index 0000000000..96083244a6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_box_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_check.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_check.svg new file mode 100644 index 0000000000..618338ab6c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_check.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_check_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_check_disable.svg new file mode 100644 index 0000000000..4a0d769208 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/combo_check_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/comboboxtree.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/comboboxtree.svg new file mode 100644 index 0000000000..e9fcf6aaf9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/comboboxtree.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/comboboxtree_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/comboboxtree_disable.svg new file mode 100644 index 0000000000..1f928e1805 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/comboboxtree_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/date.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/date.svg new file mode 100644 index 0000000000..9f3c24c5e8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/date.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/date_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/date_disable.svg new file mode 100644 index 0000000000..b0d3e0d3cb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/date_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/files_up.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/files_up.svg new file mode 100644 index 0000000000..0b8ff2b221 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/files_up.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/files_up_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/files_up_disable.svg new file mode 100644 index 0000000000..ed22586f86 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/files_up_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/iframe.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/iframe.svg new file mode 100644 index 0000000000..bb08acb5bb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/iframe.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/iframe_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/iframe_disable.svg new file mode 100644 index 0000000000..5c61541333 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/iframe_disable.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/label.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/label.svg new file mode 100644 index 0000000000..0cf19814a1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/label.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/label_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/label_disable.svg new file mode 100644 index 0000000000..9090502566 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/label_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/number_field.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/number_field.svg new file mode 100644 index 0000000000..20b147b1e7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/number_field.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/number_field_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/number_field_disable.svg new file mode 100644 index 0000000000..7c838a95cf --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/number_field_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/password_field.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/password_field.svg new file mode 100644 index 0000000000..77c851a26b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/password_field.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/password_field_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/password_field_disable.svg new file mode 100644 index 0000000000..281b7565e0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/password_field_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/picture.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/picture.svg new file mode 100644 index 0000000000..74ec505206 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/picture.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/picture_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/picture_disable.svg new file mode 100644 index 0000000000..3a35cfb7a0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/picture_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/preview.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/preview.svg new file mode 100644 index 0000000000..12dfadf802 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/preview.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/preview_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/preview_disable.svg new file mode 100644 index 0000000000..44841a7e29 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/preview_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget.svg new file mode 100644 index 0000000000..a0abe26237 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_disable.svg new file mode 100644 index 0000000000..c41228a524 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_popup.svg new file mode 100644 index 0000000000..82e36dce39 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_popup.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_popup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_popup_disable.svg new file mode 100644 index 0000000000..6fe7b6b711 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_popup_disable.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/tab.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/tab.svg new file mode 100644 index 0000000000..2ee4e3012d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/tab.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/tab_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/tab_disable.svg new file mode 100644 index 0000000000..db847114a9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/tab_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/text_area.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/text_area.svg new file mode 100644 index 0000000000..5367bebf03 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/text_area.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/text_area_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/text_area_disable.svg new file mode 100644 index 0000000000..6120485025 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/text_area_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/text_field.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/text_field.svg new file mode 100644 index 0000000000..cc3298da8c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/text_field.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/text_field_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/text_field_disable.svg new file mode 100644 index 0000000000..73d62a3439 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/text_field_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/tree.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/tree.svg new file mode 100644 index 0000000000..50b9ec8e46 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/tree.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/tree_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/tree_disable.svg new file mode 100644 index 0000000000..5c42bf7f4d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/widget/tree_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomIn.svg b/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomIn.svg new file mode 100755 index 0000000000..790d769618 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomIn.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomIn_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomIn_disable.svg new file mode 100755 index 0000000000..2b0be23758 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomIn_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomOut.svg b/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomOut.svg new file mode 100755 index 0000000000..9fdc2c5839 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomOut.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomOut_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomOut_disable.svg new file mode 100755 index 0000000000..e37d2a4521 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/zoom/zoomOut_disable.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json new file mode 100644 index 0000000000..8ceab59960 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json @@ -0,0 +1,445 @@ +{ + "name": "Fine light", + "dark": false, + "author": "fine", + "base": "com/fine/theme/icon/", + "icons": { + "cut": "cut.svg", + "save": "save.svg", + "saveFile": "saveFile.svg", + "copy": "copy.svg", + "formatBrush": "formatBrush.svg", + "paste": "paste.svg", + "undo": "undo.svg", + "redo": "redo.svg", + "run": "run.svg", + "version_save": "version_save.svg", + "font_miss_check": "font_miss_check.svg", + "template_theme": "template_theme.svg", + "remove": "remove.svg", + "search": "search.svg", + "add": "add.svg", + "add_hover": "add_hover.svg", + "detail": "detail.svg", + "dataLink": "dataLink.svg", + "jumpHelp": "jumpHelp.svg", + "switch": "switch.svg", + "drag_left": "drag_left.svg", + "drag_right": "drag_right.svg", + "down_arrow": "down_arrow.svg", + "up_arrow": "up_arrow.svg", + "select": "select.svg", + "recycle": "recycle.svg", + "time": "time.svg", + "logo": "logo.svg", + "page_query": "pageQuery.svg", + "color_picker": "colorPicker.svg", + "digitalPlatform": "digitalPlatform.svg", + "tables": "tables.svg", + "views": "views.svg", + "preview_sql": "previewSql.svg", + "database": "dataset/database.svg", + "database_warning": "dataset/database_warning.svg", + "preview": "dataset/preview.svg", + "connection": "dataset/connection.svg", + "class_table_data": "dataset/class_table_data.svg", + "data_table": "dataset/data_table.svg", + "multi": "dataset/multi.svg", + "file": "dataset/file.svg", + "tree": "dataset/tree.svg", + "store_procedure": "dataset/store_procedure.svg", + "batch_esd_on": "dataset/batch_esd_on.svg", + "batch_esd_off": "dataset/batch_esd_off.svg", + "edit": "dataset/edit.svg", + "server_database": "dataset/server_database.svg", + "server_database_warning": "dataset/server_database_warning.svg", + "field": "dataset/field.svg", + "folder": "filetree/folder.svg", + "folder_open": "filetree/folder_open.svg", + "cpt_icon": "filetree/cpt_icon.svg", + "frm_icon": "filetree/frm_icon.svg", + "fvs_icon": "filetree/fvs_icon.svg", + "excel_icon": "filetree/excel_icon.svg", + "minus": "filetree/minus.svg", + "plus": "filetree/plus.svg", + "locate": "filetree/locate.svg", + "locate_disable": "filetree/locate_disable.svg", + "rename": "filetree/rename.svg", + "collapse_all": "filetree/collapse_all.svg", + "vcs_list": "filetree/vcs_list.svg", + "view_folder": "filetree/view_folder.svg", + "refresh": "filetree/refresh.svg", + "new_folder": "filetree/new_folder.svg", + "add_report": "filetree/filetype/add_report.svg", + "add_word": "filetree/filetype/add_word.svg", + "bmpFile": "filetree/filetype/bmpFile.svg", + "chtFile": "filetree/filetype/chtFile.svg", + "classFile": "filetree/filetype/classFile.svg", + "cpt_locked": "filetree/filetype/cpt_locked.svg", + "excel_import": { + "normal": "filetree/filetype/excel_import.svg", + "disable": "filetree/filetype/excel_import_disable.svg", + "white": "filetree/filetype/excel_import_white.svg" + }, + "excelFile": { + "normal": "filetree/filetype/excelFile.svg", + "disable": "filetree/filetype/excelFile_disable.svg", + "white": "filetree/filetype/excelFile_white.svg" + }, + "flashFile": "filetree/filetype/flashFile.svg", + "frm_locked": "filetree/filetype/frm_locked.svg", + "fvs_locked": "filetree/filetype/fvs_locked.svg", + "gifFile": "filetree/filetype/gifFile.svg", + "htmlFile": "filetree/filetype/htmlFile.svg", + "jarFile": "filetree/filetype/jarFile.svg", + "javaFile": "filetree/filetype/javaFile.svg", + "jpgFile": "filetree/filetype/jpgFile.svg", + "jsFile": "filetree/filetype/jsFile.svg", + "jspFile": "filetree/filetype/jspFile.svg", + "pdfFile": { + "normal": "filetree/filetype/pdfFile.svg", + "disable": "filetree/filetype/pdfFile_disable.svg", + "white": "filetree/filetype/pdfFile_white.svg" + }, + "pngFile": "filetree/filetype/pngFile.svg", + "sqlFile": "filetree/filetype/sqlFile.svg", + "wordFile": { + "normal": "filetree/filetype/wordFile.svg", + "disable": "filetree/filetype/wordFile_disable.svg", + "white": "filetree/filetype/wordFile_white.svg" + }, + "xlsFile": "filetree/filetype/xlsFile.svg", + "xmlFile": "filetree/filetype/xmlFile.svg", + "csvFile": { + "normal": "filetree/filetype/csvFile.svg", + "disable": "filetree/filetype/csvFile_disable.svg", + "white": "filetree/filetype/csvFile_white.svg" + }, + "svgFile": { + "normal": "filetree/filetype/svgFile.svg", + "disable": "filetree/filetype/svgFile_disable.svg", + "white": "filetree/filetype/svgFile_white.svg" + }, + "txtFile": { + "normal": "filetree/filetype/txtFile.svg", + "disable": "filetree/filetype/txtFile_disable.svg", + "white": "filetree/filetype/txtFile_white.svg" + }, + "cellattr": "propertiestab/cellattr.svg", + "cellattr_disabled": "propertiestab/cellattr_disabled.svg", + "cellattr_selected": "propertiestab/cellattr_selected.svg", + "cellelement": "propertiestab/cellelement.svg", + "cellelement_disabled": "propertiestab/cellelement_disabled.svg", + "cellelement_selected": "propertiestab/cellelement_selected.svg", + "conditionattr": "propertiestab/conditionattr.svg", + "conditionattr_disabled": "propertiestab/conditionattr_disabled.svg", + "conditionattr_selected": "propertiestab/conditionattr_selected.svg", + "floatelement": "propertiestab/floatelement.svg", + "floatelement_disabled": "propertiestab/floatelement_disabled.svg", + "floatelement_popup": "propertiestab/floatelement_popup.svg", + "floatelement_selected": "propertiestab/floatelement_selected.svg", + "hyperlink": "propertiestab/hyperlink.svg", + "hyperlink_disabled": "propertiestab/hyperlink_disabled.svg", + "hyperlink_selected": "propertiestab/hyperlink_selected.svg", + "widgetlib": "propertiestab/widgetlib.svg", + "widgetlib_disabled": "propertiestab/widgetlib_disabled.svg", + "widgetlib_selected": "propertiestab/widgetlib_selected.svg", + "widgetsettings": "propertiestab/widgetsettings.svg", + "widgetsettings_disabled": "propertiestab/widgetsettings_disabled.svg", + "widgetsettings_selected": "propertiestab/widgetsettings_selected.svg", + "configuredroles": "propertiestab/configuredroles.svg", + "configuredroles_selected": "propertiestab/configuredroles_selected.svg", + "configuredroles_disabled": "propertiestab/configuredroles_disabled.svg", + "authorityedit": "propertiestab/authorityedit.svg", + "authorityedit_disabled": "propertiestab/authorityedit_disabled.svg", + "authorityedit_selected": "propertiestab/authorityedit_selected.svg", + "add_worksheet": "sheet/add_sheet.svg", + "add_polysheet": "sheet/add_frm.svg", + "checkbox_checked": "checkbox/checked.svg", + "checkbox_unchecked": "checkbox/unchecked.svg", + "checkbox_part_checked": "checkbox/part_checked.svg", + "checkbox_hovered": "checkbox/hovered.svg", + "radio_selected": "radio/radio_selected.svg", + "radio_unselected": "radio/radio_unselected.svg", + "bold": "font/bold.svg", + "italic": "font/italic.svg", + "underline": "font/underline.svg", + "foreground": "font/foreground.svg", + "background": "font/background.svg", + "h_left": "cellstyle/h_left.svg", + "h_center": "cellstyle/h_center.svg", + "h_right": "cellstyle/h_right.svg", + "h_justify": "cellstyle/h_justify.svg", + "h_normal": "cellstyle/h_normal.svg", + "v_top": "cellstyle/v_top.svg", + "v_center": "cellstyle/v_center.svg", + "v_bottom": "cellstyle/v_bottom.svg", + "noboder": "noboder.svg", + "merge": "merge/merge.svg", + "unmerge": "merge/unmerge.svg", + "bind_column": "bindcolumn/bind_column.svg", + "text": "insert/text.svg", + "richtext": "insert/richtext.svg", + "formula": "insert/formula.svg", + "formula_popup": "insert/formula_popup.svg", + "chart": "insert/chart.svg", + "image": "insert/image.svg", + "bias": "insert/bias.svg", + "sub_report": "insert/sub_report.svg", + "float_normal": "insert/float_normal.svg", + "popup": { + "normal": "popup/popup.svg" + }, + "clear": "clear.svg", + "clear_hover": "clear_hover.svg", + "stash": "toolbar/stash.svg", + "appendRow": "toolbar/append_row.svg", + "deleteRow": "toolbar/delete_row.svg", + "appendColumn": "toolbar/append_column.svg", + "deleteColumn": "toolbar/delete_column.svg", + "showValue": "toolbar/showValue.svg", + "tool_copy": "toolbar/copy.svg", + "move_down": "toolbar/move_down.svg", + "move_up": "toolbar/move_up.svg", + "move_left": "toolbar/move_left.svg", + "move_right": "toolbar/move_right.svg", + "to_top": "toolbar/to_top.svg", + "to_bottom": "toolbar/to_bottom.svg", + "tool_edit": "toolbar/edit.svg", + "tool_edit_white": "toolbar/edit_white.svg", + "tool_more": "toolbar/more.svg", + "tool_more_hover": "toolbar/more_hover.svg", + "tool_config": "toolbar/config.svg", + "add_popup": "toolbar/add_popup.svg", + "bracket": "toolbar/bracket.svg", + "unBracket": "toolbar/unBracket.svg", + "filter": "toolbar/filter.svg", + "filter_popup": "toolbar/filter_popup.svg", + "param_edit": "param/edit.svg", + "param_edit_pressed": "param/edit_pressed.svg", + "param_hide": "param/hide.svg", + "param_hide_pressed": "param/hide_pressed.svg", + "param_view": "param/view.svg", + "param_view_pressed": "param/view_pressed.svg", + "param": "param/param.svg", + "locked": "lock/locked.svg", + "unlocked": "lock/unlocked.svg", + "notification": "notification/notification.svg", + "notification_dot": "notification/notification_dot.svg", + "createCpt": "toolbar/createCpt.svg", + "createFvs": "toolbar/createFvs.svg", + "createOther": "toolbar/createOther.svg", + "createFrm": "toolbar/createFrm.svg", + "openTemplate": "toolbar/openTemplate.svg", + "switchEnv": "toolbar/switchEnv.svg", + "localConnect": "toolbar/localConnect.svg", + "remoteConnect": "toolbar/remoteConnect.svg", + "export": "toolbar/export.svg", + "monochrome_undo": "toolbar/monochrome_undo.svg", + "monochrome_redo": "toolbar/monochrome_redo.svg", + "saveAs": "toolbar/saveAs.svg", + "widgetThemeMenu": "toolbar/widgetThemeMenu.svg", + "datasource": "toolbar/datasource.svg", + "webReportAttribute": "toolbar/webReportAttribute.svg", + "reportParameter": "toolbar/reportParameter.svg", + "reportFit": "toolbar/reportFit.svg", + "mobileAttr": "toolbar/mobileAttr.svg", + "watermark": "toolbar/watermark.svg", + "dataVerify": "toolbar/dataVerify.svg", + "clearStash": "toolbar/clearStash.svg", + "print": "toolbar/print.svg", + "printPdf": "toolbar/printPdf.svg", + "printApplet": "toolbar/printApplet.svg", + "printPreview": "toolbar/printPreview.svg", + "pageSetup": "toolbar/pageSetup.svg", + "reportHeader": "toolbar/reportHeader.svg", + "reportFooter": "toolbar/reportFooter.svg", + "reportBackground": "toolbar/reportBackground.svg", + "reportWriteAttr": "toolbar/reportWriteAttr.svg", + "linearAttr": "toolbar/linearAttr.svg", + "repeatAndFrozen": "toolbar/repeatAndFrozen.svg", + "reportEngineAttr": "toolbar/reportEngineAttr.svg", + "allowAuthorityEdit": "toolbar/allowAuthorityEdit.svg", + "replace": "toolbar/replace.svg", + "monochromeServerDatabase": "toolbar/monochromeServerDatabase.svg", + "platform": "toolbar/platform.svg", + "remoteDesignAuthManager": "toolbar/remoteDesignAuthManager.svg", + "pluginManager": "toolbar/pluginManager.svg", + "functionManager": "toolbar/functionManager.svg", + "serverConfigManager": "toolbar/serverConfigManager.svg", + "widgetManager": "toolbar/widgetManager.svg", + "chartPreStyle": "toolbar/chartPreStyle.svg", + "chartEmptyDataStyle": "toolbar/chartEmptyDataStyle.svg", + "charMapData": "toolbar/charMapData.svg", + "demo": "toolbar/demo.svg", + "update": "toolbar/update.svg", + "envDetect": "toolbar/envDetect.svg", + "servicePlatform": "toolbar/servicePlatform.svg", + "bbs": "toolbar/bbs.svg", + "video": "toolbar/video.svg", + "help": "toolbar/help.svg", + "studyPlan": "toolbar/studyPlan.svg", + "question": "toolbar/question.svg", + "solution": "toolbar/solution.svg", + "templateStore": "toolbar/templateStore.svg", + "bug": "toolbar/bug.svg", + "need": "toolbar/need.svg", + "workOrderCenter": "toolbar/workOrderCenter.svg", + "actCenter": "toolbar/actCenter.svg", + "sign": "toolbar/sign.svg", + "page_first": "toolbar/page_first.svg", + "page_next": "toolbar/page_next.svg", + "page_previous": "toolbar/page_previous.svg", + "page_last": "toolbar/page_last.svg", + "page_navi": "toolbar/page_navi.svg", + "email": "toolbar/email.svg", + "scale": "toolbar/scale.svg", + "printerOffset": "toolbar/printerOffset.svg", + "customButton": "toolbar/customButton.svg", + "page": "toolbar/page.svg", + "pages": "toolbar/pages.svg", + "new_line": "toolbar/newLine.svg", + "selected_all": "toolbar/selectedAll.svg", + "templateThemeManager": "toolbar/templateThemeManager.svg", + "cellelement_small": "cellelement.svg", + "forbid": "expand/forbid.svg", + "horizontal_expand": "expand/horizontal.svg", + "vertical_expand": "expand/vertical.svg", + "triangle_down": "triangle/triangle_down.svg", + "triangle_down_small": "triangle/triangle_down_small.svg", + "triangle_left": "triangle/triangle_left.svg", + "triangle_left_small": "triangle/triangle_left_small.svg", + "triangle_right": "triangle/triangle_right.svg", + "triangle_right_small": "triangle/triangle_right_small.svg", + "zoomIn": "zoom/zoomIn.svg", + "zoomOut": "zoom/zoomOut.svg", + "sort_asc": "sort/sort_asc.svg", + "sort_desc": "sort/sort_desc.svg", + "nosort": "sort/nosort.svg", + "close": "close/close.svg", + "close_round": "close/close_round.svg", + "platform_close": "close/platform_close.svg", + "add_parenthesis": "font/add_parenthesis.svg", + "remove_parenthesis": "font/remove_parenthesis.svg", + "shadow": "font/shadow.svg", + "strike": "font/strike.svg", + "sub": "font/sub.svg", + "super": "font/super.svg", + "dot": "dot.svg", + "expand_popup": "popup/expand_popup.svg", + "collapse_popup": "popup/collapse_popup.svg", + "logMsg": "log/logMsg.svg", + "logMsg_dot": "log/logMsg_dot.svg", + "cellClear": "cell/cellClear.svg", + "cellExpandAttr": "cell/cellExpandAttr.svg", + "cellStyleAttr": "cell/cellStyleAttr.svg", + "cellOtherAttr": "cell/cellOtherAttr.svg", + "cellWidgetAttr": "cell/cellWidgetAttr.svg", + "cellConditionalAttr": "cell/cellConditionalAttr.svg", + "cellHyperLinkAttr": "cell/cellHyperLinkAttr.svg", + "cellPresentAttr": "cell/cellPresentAttr.svg", + "cellElementAttr": "cell/cellElementAttr.svg", + "cellSelect": "cell/cellSelect.svg", + "selectedMark": "cell/selectedMark.svg", + "move": "filetree/move.svg", + "monochrome_copy": "filetree/monochrome_copy.svg", + "monochrome_paste": "filetree/monochrome_paste.svg", + "monochrome_cut": "filetree/monochrome_cut.svg", + "button": "widget/button.svg", + "button_group": "widget/button_group.svg", + "check_box": "widget/checkbox.svg", + "checkbox_group": "widget/checkbox_group.svg", + "combo_box": "widget/combo_box.svg", + "combo_check": "widget/combo_check.svg", + "comboboxtree": "widget/comboboxtree.svg", + "date": "widget/date.svg", + "files_up": "widget/files_up.svg", + "iframe": "widget/iframe.svg", + "label": "widget/label.svg", + "number_field": "widget/number_field.svg", + "password_field": "widget/password_field.svg", + "picture": "widget/picture.svg", + "widget_preview": "widget/preview.svg", + "apply_components": "widget/apply_components.svg", + "prewidget": "widget/prewidget.svg", + "prewidget_popup": "widget/prewidget_popup.svg", + "tab": "widget/tab.svg", + "text_area": "widget/text_area.svg", + "text_field": "widget/text_field.svg", + "widget_tree": "widget/tree.svg", + "dsColumnName": "editor/dsColumnName.svg", + "dsColumnName_popup": "editor/dsColumnName_popup.svg", + "dsColumnIndex": "editor/dsColumnIndex.svg", + "dsColumnIndex_popup": "editor/dsColumnIndex_popup.svg", + "ds_column": "editor/ds_column.svg", + "type_double": "editor/type_double.svg", + "type_double_popup": "editor/type_double_popup.svg", + "type_boolean": "editor/type_boolean.svg", + "type_boolean_popup": "editor/type_boolean_popup.svg", + "date_popup": "editor/date_popup.svg", + "param_popup": "editor/param_popup.svg", + "cellelement_popup": "editor/cellelement_popup.svg", + "bind_column_popup": "editor/bind_column_popup.svg", + "preview_mobile": "preview/preview_mobile.svg", + "preview_paging": "preview/preview_paging.svg", + "preview_write": "preview/preview_write.svg", + "data_analysis": "preview/data_analysis.svg", + "variable": "variable/variable.svg", + "dataItem": "variable/dataItem.svg", + "param_global": "variable/param_global.svg", + "local_server_background": "startup/local_server_background.svg", + "remote_server_background": "startup/remote_server_background.svg", + "more_arrow": "startup/more.svg", + "more_arrow_hover": "startup/more_hover.svg", + "show_less": "startup/show_less.svg", + "show_more": "startup/show_more.svg", + "polyReportBlock": "chart/polyReportBlock.svg", + "chart_column": "chart/chart_column.svg", + "chart_pie": "chart/chart_pie.svg", + "chart_bar": "chart/chart_bar.svg", + "chart_line": "chart/chart_line.svg", + "chart_area": "chart/chart_area.svg", + "chart_bubble": "chart/chart_bubble.svg", + "chart_scatter": "chart/chart_scatter.svg", + "chart_radar": "chart/chart_radar.svg", + "chart_meter": "chart/chart_meter.svg", + "chart_box": "chart/chart_box.svg", + "chart_map": "chart/chart_map.svg", + "chart_drillMap": "chart/chart_drillMap.svg", + "chart_multiPie": "chart/chart_multiPie.svg", + "chart_funnel": "chart/chart_funnel.svg", + "chart_combine": "chart/chart_combine.svg", + "chart_gantt": "chart/chart_gantt.svg", + "chart_heatMap": "chart/chart_heatMap.svg", + "chart_rectangleTree": "chart/chart_rectangleTree.svg", + "chart_wordCloud": "chart/chart_wordCloud.svg", + "chart_frame": "chart/chart_frame.svg", + "out": "border/out.svg", + "in": "border/in.svg", + "bottom": "border/bottom.svg", + "vertical": "border/vertical.svg", + "bottom_thick": "border/bottom_thick.svg", + "out_thick": "border/out_thick.svg", + "double_bottom": "border/double_bottom.svg", + "left": "border/left.svg", + "horizontal": "border/horizontal.svg", + "none": "border/none.svg", + "right": "border/right.svg", + "top_bottom": "border/top_bottom.svg", + "top_thick_bottom": "border/top_thick_bottom.svg", + "top_double_bottom": "border/top_double_bottom.svg", + "top": "border/top.svg", + "all":"border/all.svg", + "error":"tip/error.svg", + "information":"tip/information.svg", + "new_information":"tip/new_information.svg", + "success":"tip/success.svg", + "warning":"tip/warning.svg", + "layout_top": "layout/layout_top.svg", + "layout_bottom": "layout/layout_bottom.svg", + "layout_left": "layout/layout_left.svg", + "layout_right": "layout/layout_right.svg", + "layout_top_right": "layout/layout_top_right.svg" + + } +} diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineDarkLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineDarkLaf.properties new file mode 100644 index 0000000000..fad32ce197 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineDarkLaf.properties @@ -0,0 +1,351 @@ +#---- variables ---- + +# general background and foreground (text color) +@background = #3c3f41 +@foreground = #bbb +@disabledBackground = @background +@disabledForeground = shade(@foreground,25%) + +# component background +@buttonBackground = tint(@background,9%) +@componentBackground = tint(@background,5%) +@menuBackground = darken(@background,5%) + +# selection +@selectionBackground = @accentSelectionBackground +@selectionForeground = contrast(@selectionBackground, @background, @foreground, 25%) +@selectionInactiveBackground = spin(saturate(shade(@selectionBackground,70%),20%),-15) +@selectionInactiveForeground = @foreground + +# menu +@menuSelectionBackground = @selectionBackground +@menuHoverBackground = lighten(@menuBackground,10%,derived) +@menuCheckBackground = darken(@menuSelectionBackground,10%,derived noAutoInverse) +@menuAcceleratorForeground = darken(@foreground,15%) +@menuAcceleratorSelectionForeground = @selectionForeground + +# misc +@cellFocusColor = lighten(@selectionBackground,10%) +@icon = shade(@foreground,7%) + +# accent colors (blueish) +# set @accentColor to use single accent color or +# modify @accentBaseColor to use variations of accent base color +@accentColor = systemColor(accent,null) +@accentBaseColor = #4B6EAF +@accentBase2Color = lighten(saturate(spin(@accentBaseColor,-8),13%),5%) +# accent color variations +@accentFocusColor = if(@accentColor, @accentColor, shade(spin(@accentBaseColor,-8),20%)) +@accentLinkColor = if(@accentColor, @accentColor, lighten(saturate(spin(@accentBaseColor,-5),50%),16%)) +@accentSelectionBackground = if(@accentColor, @accentColor, @accentBaseColor) +@accentSliderColor = if(@accentColor, @accentColor, @accentBase2Color) +@accentUnderlineColor = if(@accentColor, @accentColor, @accentBase2Color) +@accentButtonDefaultBackground = if(@accentColor, @accentColor, darken(spin(@accentBaseColor,-8),13%)) + +# for buttons within components (e.g. combobox or spinner) +@buttonArrowColor = shade(@foreground,17%) +@buttonDisabledArrowColor = darken(@buttonArrowColor,25%) +@buttonHoverArrowColor = lighten(@buttonArrowColor,10%,derived noAutoInverse) +@buttonPressedArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse) + +# Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors) +@dropCellBackground = darken(List.selectionBackground,10%,lazy) +@dropCellForeground = lazy(List.selectionForeground) +@dropLineColor = lighten(List.selectionBackground,10%,lazy) +@dropLineShortColor = lighten(List.selectionBackground,30%,lazy) + + +#---- system colors ---- + +activeCaption = #434E60 +inactiveCaption = #393C3D +controlHighlight = darken($controlShadow,20%) +controlLtHighlight = darken($controlShadow,25%) +controlDkShadow = lighten($controlShadow,10%) + + +#---- Button ---- + +Button.background = @buttonBackground +Button.hoverBackground = lighten($Button.background,3%,derived) +Button.pressedBackground = lighten($Button.background,6%,derived) +Button.selectedBackground = lighten($Button.background,10%,derived) +Button.selectedForeground = $Button.foreground +Button.disabledSelectedBackground = lighten($Button.background,3%,derived) + +Button.borderColor = tint($Button.background,10%) +Button.disabledBorderColor = $Button.borderColor +Button.focusedBorderColor = $Component.focusedBorderColor +Button.hoverBorderColor = $Button.focusedBorderColor + +Button.innerFocusWidth = 1 + +Button.default.background = @accentButtonDefaultBackground +Button.default.foreground = contrast($Button.default.background, @background, $Button.foreground, 25%) +Button.default.hoverBackground = lighten($Button.default.background,3%,derived) +Button.default.pressedBackground = lighten($Button.default.background,6%,derived) +Button.default.borderColor = tint($Button.default.background,15%) +Button.default.hoverBorderColor = tint($Button.default.background,18%) +Button.default.focusedBorderColor = $Button.default.hoverBorderColor +Button.default.focusColor = lighten($Component.focusColor,3%) +Button.default.boldText = true + +Button.toolbar.hoverBackground = lighten($Button.background,1%,derived) +Button.toolbar.pressedBackground = lighten($Button.background,4%,derived) +Button.toolbar.selectedBackground = lighten($Button.background,7%,derived) + + +#---- CheckBox ---- + +CheckBox.icon.focusWidth = 1 + +# enabled +CheckBox.icon.borderColor = tint($Component.borderColor,5%) +CheckBox.icon.background = tint(@background,5%) +CheckBox.icon.selectedBorderColor = tint($CheckBox.icon.borderColor,20%) +CheckBox.icon.selectedBackground = $CheckBox.icon.background +CheckBox.icon.checkmarkColor = shade(@foreground,10%) + +# disabled +CheckBox.icon.disabledBorderColor = shade($CheckBox.icon.borderColor,20%) +CheckBox.icon.disabledBackground = @disabledBackground +CheckBox.icon.disabledCheckmarkColor = darken($CheckBox.icon.checkmarkColor,25%) + +# focused +CheckBox.icon.focusedBorderColor = $Component.focusedBorderColor +CheckBox.icon.focusedBackground = fade($CheckBox.icon.focusedBorderColor,30%) + +# hover +CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor +CheckBox.icon.hoverBackground = lighten($CheckBox.icon.background,3%,derived) + +# pressed +CheckBox.icon.pressedBorderColor = $CheckBox.icon.focusedBorderColor +CheckBox.icon.pressedBackground = lighten($CheckBox.icon.background,6%,derived) + + +# used if CheckBox.icon.style or RadioButton.icon.style = filled +# enabled +CheckBox.icon[filled].selectedBorderColor = $CheckBox.icon.checkmarkColor +CheckBox.icon[filled].selectedBackground = $CheckBox.icon.checkmarkColor +CheckBox.icon[filled].checkmarkColor = $CheckBox.icon.background +# hover +CheckBox.icon[filled].hoverSelectedBackground = darken($CheckBox.icon[filled].selectedBackground,3%,derived) +# pressed +CheckBox.icon[filled].pressedSelectedBackground = darken($CheckBox.icon[filled].selectedBackground,6%,derived) + + +#---- CheckBoxMenuItem ---- + +CheckBoxMenuItem.icon.checkmarkColor = @buttonArrowColor +CheckBoxMenuItem.icon.disabledCheckmarkColor = @buttonDisabledArrowColor + + +#---- Component ---- + +Component.borderColor = tint(@background,19%) +Component.disabledBorderColor = $Component.borderColor +Component.focusedBorderColor = lighten($Component.focusColor,5%) +Component.focusColor = @accentFocusColor +Component.linkColor = @accentLinkColor +Component.accentColor = if(@accentColor, @accentColor, @accentBaseColor) +Component.grayFilter = -20,-70,100 + +Component.error.borderColor = desaturate($Component.error.focusedBorderColor,25%) +Component.error.focusedBorderColor = #8b3c3c +Component.warning.borderColor = darken(desaturate($Component.warning.focusedBorderColor,20%),10%) +Component.warning.focusedBorderColor = #ac7920 +Component.custom.borderColor = desaturate(#f00,50%,relative derived noAutoInverse) + + +#---- Desktop ---- + +Desktop.background = #3E434C + + +#---- DesktopIcon ---- + +DesktopIcon.background = lighten($Desktop.background,10%,derived) + + +#---- HelpButton ---- + +HelpButton.questionMarkColor = shade(@foreground,10%) +HelpButton.disabledQuestionMarkColor = tint(@background,30%) + + +#---- InternalFrame ---- + +InternalFrame.activeTitleBackground = darken(@background,10%) +InternalFrame.activeTitleForeground = @foreground +InternalFrame.inactiveTitleBackground = lighten($InternalFrame.activeTitleBackground,5%) +InternalFrame.inactiveTitleForeground = @disabledForeground + +InternalFrame.activeBorderColor = darken(@background,7%) +InternalFrame.inactiveBorderColor = darken(@background,3%) + +InternalFrame.buttonHoverBackground = lighten($InternalFrame.activeTitleBackground,10%,derived) +InternalFrame.buttonPressedBackground = lighten($InternalFrame.activeTitleBackground,20%,derived) +InternalFrame.closeHoverBackground = lazy(Actions.Red) +InternalFrame.closePressedBackground = darken(Actions.Red,10%,lazy) +InternalFrame.closeHoverForeground = #fff +InternalFrame.closePressedForeground = #fff + +InternalFrame.activeDropShadowOpacity = 0.5 +InternalFrame.inactiveDropShadowOpacity = 0.75 + + +#---- Menu ---- + +Menu.icon.arrowColor = @buttonArrowColor +Menu.icon.disabledArrowColor = @buttonDisabledArrowColor + + +#---- MenuBar ---- + +MenuBar.borderColor = $Separator.foreground + + +#---- PasswordField ---- + +PasswordField.capsLockIconColor = #ffffff64 +PasswordField.revealIconColor = @foreground + + +#---- Popup ---- + +Popup.dropShadowColor = #000 +Popup.dropShadowOpacity = 0.25 + + +#---- PopupMenu ---- + +PopupMenu.borderColor = tint(@background,17%) +PopupMenu.hoverScrollArrowBackground = lighten(@background,5%) + + +#---- ProgressBar ---- + +ProgressBar.background = lighten(@background,8%) +ProgressBar.foreground = @accentSliderColor +ProgressBar.selectionBackground = @foreground +ProgressBar.selectionForeground = contrast($ProgressBar.foreground, @background, @foreground, 25%) + + +#---- RootPane ---- + +RootPane.activeBorderColor = lighten(@background,7%,derived) +RootPane.inactiveBorderColor = lighten(@background,5%,derived) + + +#---- ScrollBar ---- + +ScrollBar.track = lighten(@background,1%,derived noAutoInverse) +ScrollBar.thumb = lighten($ScrollBar.track,10%,derived noAutoInverse) +ScrollBar.hoverTrackColor = lighten($ScrollBar.track,4%,derived noAutoInverse) +ScrollBar.hoverThumbColor = lighten($ScrollBar.thumb,10%,derived noAutoInverse) +ScrollBar.pressedThumbColor = lighten($ScrollBar.thumb,15%,derived noAutoInverse) +ScrollBar.hoverButtonBackground = lighten(@background,5%,derived noAutoInverse) +ScrollBar.pressedButtonBackground = lighten(@background,10%,derived noAutoInverse) + + +#---- Separator ---- + +Separator.foreground = tint(@background,10%) + + +#---- Slider ---- + +Slider.trackValueColor = @accentSliderColor +Slider.trackColor = lighten(@background,15%) +Slider.thumbColor = $Slider.trackValueColor +Slider.tickColor = @disabledForeground +Slider.focusedColor = fade(changeLightness($Component.focusColor,60%,derived),30%,derived) +Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,derived) +Slider.pressedThumbColor = lighten($Slider.thumbColor,8%,derived) +Slider.disabledTrackColor = lighten(@background,10%) +Slider.disabledThumbColor = $Slider.disabledTrackColor + + +#---- SplitPane ---- + +SplitPaneDivider.draggingColor = $Component.borderColor + + +#---- TabbedPane ---- + +TabbedPane.underlineColor = @accentUnderlineColor +TabbedPane.inactiveUnderlineColor = mix(@accentUnderlineColor,$TabbedPane.background,60%) +TabbedPane.disabledUnderlineColor = lighten(@background,23%) +TabbedPane.hoverColor = darken($TabbedPane.background,5%,derived noAutoInverse) +TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,25%) +TabbedPane.contentAreaColor = $Component.borderColor + +TabbedPane.buttonHoverBackground = darken($TabbedPane.background,5%,derived noAutoInverse) +TabbedPane.buttonPressedBackground = darken($TabbedPane.background,8%,derived noAutoInverse) + +TabbedPane.closeBackground = null +TabbedPane.closeForeground = @disabledForeground +TabbedPane.closeHoverBackground = lighten($TabbedPane.background,5%,derived) +TabbedPane.closeHoverForeground = @foreground +TabbedPane.closePressedBackground = lighten($TabbedPane.background,10%,derived) +TabbedPane.closePressedForeground = $TabbedPane.closeHoverForeground + + +#---- Table ---- + +Table.gridColor = lighten($Table.background,8%) + + +#---- TableHeader ---- + +TableHeader.hoverBackground = lighten($TableHeader.background,5%,derived) +TableHeader.pressedBackground = lighten($TableHeader.background,10%,derived) +TableHeader.separatorColor = lighten($TableHeader.background,10%) +TableHeader.bottomSeparatorColor = $TableHeader.separatorColor + + +#---- TitlePane ---- + +TitlePane.embeddedForeground = darken($TitlePane.foreground,15%) +TitlePane.buttonHoverBackground = lighten($TitlePane.background,15%,derived) +TitlePane.buttonPressedBackground = lighten($TitlePane.background,10%,derived) + + +#---- ToggleButton ---- + +ToggleButton.selectedBackground = lighten($ToggleButton.background,10%,derived) +ToggleButton.disabledSelectedBackground = lighten($ToggleButton.background,3%,derived) + +ToggleButton.toolbar.selectedBackground = lighten($ToggleButton.background,7%,derived) + + +#---- ToolBar ---- + +ToolBar.hoverButtonGroupBackground = lighten($ToolBar.background,3%,derived) + + +#---- ToolTip ---- + +ToolTip.border = 4,6,4,6 +ToolTip.background = shade(@background,50%) + + +#---- Tree ---- + +Tree.hash = lighten($Tree.background,5%) + + + +#---- Styles ------------------------------------------------------------------ + +#---- inTextField ---- +# for leading/trailing components in text fields + +[style]Button.inTextField = \ + focusable: false; \ + toolbar.margin: 1,1,1,1; \ + toolbar.spacingInsets: 1,1,1,1; \ + toolbar.hoverBackground: lighten($TextField.background,5%); \ + toolbar.pressedBackground: lighten($TextField.background,10%); \ + toolbar.selectedBackground: lighten($TextField.background,15%) diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLaf.properties new file mode 100644 index 0000000000..9ac0952b65 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLaf.properties @@ -0,0 +1,57 @@ +# \u516C\u5171\u5C5E\u6027\uFF0C\u5982UI\u7B49\uFF0C\u5176\u4ED6\u4E3B\u9898\u7EE7\u627F\u8BE5\u4E3B\u9898\uFF0C\u9632\u6B62\u51FA\u73B0UI\u4E0D\u5B58\u5728\u7B49\u95EE\u9898 +#---- UI delegates ---- +ButtonUI=com.fine.theme.light.ui.FineButtonUI +CheckBoxUI=com.fine.theme.light.ui.FineCheckBoxUI +CheckBoxMenuItemUI=com.formdev.flatlaf.ui.FlatCheckBoxMenuItemUI +ColorChooserUI=com.formdev.flatlaf.ui.FlatColorChooserUI +ComboBoxUI=com.fine.theme.light.ui.FineComboBoxUI +DesktopIconUI=com.formdev.flatlaf.ui.FlatDesktopIconUI +DesktopPaneUI=com.formdev.flatlaf.ui.FlatDesktopPaneUI +EditorPaneUI=com.formdev.flatlaf.ui.FlatEditorPaneUI +FileChooserUI=com.formdev.flatlaf.ui.FlatFileChooserUI +FormattedTextFieldUI=com.formdev.flatlaf.ui.FlatFormattedTextFieldUI +InternalFrameUI=com.formdev.flatlaf.ui.FlatInternalFrameUI +LabelUI=com.formdev.flatlaf.ui.FlatLabelUI +ListUI=com.formdev.flatlaf.ui.FlatListUI +MenuUI=com.formdev.flatlaf.ui.FlatMenuUI +MenuBarUI=com.formdev.flatlaf.ui.FlatMenuBarUI +MenuItemUI=com.fine.theme.light.ui.FineMenuItemUI +TemplateListMenuItemUI=com.fine.theme.light.ui.FineTemplateListMenuItemUI +OptionPaneUI=com.fine.theme.light.ui.FineOptionPaneUI +PanelUI=com.fine.theme.light.ui.FinePanelUI +PasswordFieldUI=com.formdev.flatlaf.ui.FlatPasswordFieldUI +PopupMenuUI=com.fine.theme.light.ui.FinePopupMenuUI +PopupMenuSeparatorUI=com.fine.theme.light.ui.FinePopupMenuSeparatorUI +ProgressBarUI=com.formdev.flatlaf.ui.FlatProgressBarUI +RadioButtonUI=com.formdev.flatlaf.ui.FlatRadioButtonUI +RadioButtonMenuItemUI=com.formdev.flatlaf.ui.FlatRadioButtonMenuItemUI +RootPaneUI=com.formdev.flatlaf.ui.FlatRootPaneUI +ScrollBarUI=com.formdev.flatlaf.ui.FlatScrollBarUI +ScrollPaneUI=com.formdev.flatlaf.ui.FlatScrollPaneUI +SeparatorUI=com.formdev.flatlaf.ui.FlatSeparatorUI +SliderUI=com.fine.theme.light.ui.FineSliderUI +SpinnerUI=com.formdev.flatlaf.ui.FlatSpinnerUI +SplitPaneUI=com.formdev.flatlaf.ui.FlatSplitPaneUI +TabbedPaneUI=com.formdev.flatlaf.ui.FlatTabbedPaneUI +TableUI=com.formdev.flatlaf.ui.FlatTableUI +TableVerticalBarUI=com.fine.theme.light.ui.FineTableScrollBarPaneUI +TableHeaderUI=com.fine.theme.light.ui.FineTableHeaderUI +TextAreaUI=com.formdev.flatlaf.ui.FlatTextAreaUI +TextFieldUI=com.formdev.flatlaf.ui.FlatTextFieldUI +TextPaneUI=com.formdev.flatlaf.ui.FlatTextPaneUI +ToggleButtonUI=com.fine.theme.light.ui.FineToggleButtonUI +ToolBarUI=com.formdev.flatlaf.ui.FlatToolBarUI +ToolBarSeparatorUI=com.formdev.flatlaf.ui.FlatToolBarSeparatorUI +ToolTipUI=com.fine.theme.light.ui.FineTooltipUI +TreeUI=com.fine.theme.light.ui.UIFlatTreeUI +ViewportUI=com.formdev.flatlaf.ui.FlatViewportUI +HeadGroupUI=com.fine.theme.light.ui.FineHeadGroupUI +ButtonGroupUI=com.fine.theme.light.ui.FineButtonGroupUI +SelectBoxUI=com.fine.theme.light.ui.FineSelectBoxUI +CombinationButtonUI=com.fine.theme.light.ui.FineCombinationButtonUI +InputUI=com.fine.theme.light.ui.FineInputUI +GradientBarUI=com.fine.theme.light.ui.FineGradientBarUI +TemplateTabPaneUI=com.fine.theme.light.ui.FineTemplateTabPaneUI +ReportComponentCompositeUI=com.fine.theme.light.ui.FineReportComponentCompositeUI +ColorButtonUI=com.fine.theme.light.ui.FineColorButtonUI +HeaderPaneUI=com.fine.theme.light.ui.FineHeaderPaneUI diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties new file mode 100644 index 0000000000..f31bda6cf5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties @@ -0,0 +1,1399 @@ +# +# Copyright 2019 FormDev Software GmbH +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# This file is loaded for all light themes (that extend class FlatLightLaf). +# +# Documentation: +# - https://www.formdev.com/flatlaf/properties-files/ +# - https://www.formdev.com/flatlaf/how-to-customize/ +# +# NOTE: Avoid copying the whole content of this file to own properties files. +# This will make upgrading to newer FlatLaf versions complex and error-prone. +# Instead, copy and modify only those properties that you need to alter. +# + +# Colors and style mostly based on IntelliJ theme from IntelliJ IDEA Community Edition, +# which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o. +# See: https://github.com/JetBrains/intellij-community/ + +# font weights +# Windows +[win]defaultFont = "Microsoft YaHei", "Microsoft JhengHei", MingLiU, Arial +[win]light.font = "Microsoft YaHei", "Microsoft JhengHei", MingLiU, "Arial +[win]semibold.font = "Microsoft YaHei", "Microsoft JhengHei", MingLiU, Arial +# macOS +[mac]defaultFont = 12 "PingFang SC", "Apple LiGothic", "Apple LiSun", Arial +[mac]light.font = "PingFang SC", "Apple LiGothic", "Apple LiSun", Arial +[mac]semibold.font = "PingFang SC", "Apple LiGothic", "Apple LiSun", Arial +# Linux +[linux]defaultFont = 12 "Noto SansCJK", SimHei, Arial, Ubuntu +[linux]light.font = "Noto SansCJK", SimHei, Arial, Ubuntu +[linux]semibold.font = "Noto SansCJK", SimHei, Arial, Ubuntu + +#---- variables ---- +Component.defaultHeight=24 +Component.defaultVGap=10 +# ---- Brand ---- +@BrandColor = #2576EF +@BrandHoverColor = #5493F2 +@BrandPressedColor = #105DD1 +@BrandHoverColorSP = #2576EF 12% +@BrandTipColor = #0A1C3877 +@marginSmall = 4 +@marginLarge = 10 + +# general background and foreground (text color) +@background = #F6F8FA +@foreground=#0A1C38 +@disabledBackground = @background +@disabledForeground = tint(@foreground,55%) + +# component background +@buttonBackground = #FFF +@componentBackground = @background +@menuBackground = @background + +# selection +@selectionBackground = #2576ef1e +@selectionForeground = @foreground +@selectionInactiveBackground = shade(@background,13%) +@selectionInactiveForeground = @foreground + +# menu +@menuSelectionBackground = @selectionBackground +@menuHoverBackground = darken(@menuBackground,10%,derived) +@menuCheckBackground = lighten(@menuSelectionBackground,40%,derived noAutoInverse) +@menuAcceleratorForeground = lighten(@foreground,30%) +@menuAcceleratorSelectionForeground = @selectionForeground + +# misc +@cellFocusColor = darken(@selectionBackground,20%) +@icon = shade(@background,27%) + + + +# accent colors (blueish) +# set @accentColor to use single accent color or +# modify @accentBaseColor to use variations of accent base color +@accentColor = @BrandColor +@accentBaseColor = @BrandColor +@accentBase2Color = lighten(saturate(@accentBaseColor,10%),6%) +# accent color variations +@accentCheckmarkColor = if(@accentColor, @accentColor, tint(@accentBase2Color,20%)) +@accentFocusColor = if(@accentColor, @accentColor, lighten(@accentBaseColor,31%)) +@accentLinkColor = if(@accentColor, @accentColor, darken(@accentBaseColor,3%)) +@accentSelectionBackground = if(@accentColor, @accentColor, @accentBaseColor) +@accentSliderColor = if(@accentColor, @accentColor, @accentBase2Color) +@accentUnderlineColor = if(@accentColor, @accentColor, tint(@accentBaseColor,10%)) +@accentButtonDefaultBorderColor = if(@accentColor, @accentColor, tint(@accentBase2Color,20%)) + +# for buttons within components (e.g. combobox or spinner) +@buttonArrowColor = #0A1C38 +@buttonDisabledArrowColor = lighten(@buttonArrowColor,25%) +@buttonHoverArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse) +@buttonPressedArrowColor = lighten(@buttonArrowColor,30%,derived noAutoInverse) + +# Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors) +@dropCellBackground = lighten(List.selectionBackground,10%,lazy) +@dropCellForeground = lazy(List.selectionForeground) +@dropLineColor = lighten(List.selectionBackground,20%,lazy) +@dropLineShortColor = darken(List.selectionBackground,20%,lazy) + + +#---- system colors ---- + +activeCaption = #99b4d1 +inactiveCaption = #bfcddb +controlHighlight = lighten($controlShadow,12%) +controlLtHighlight = lighten($controlShadow,25%) +controlDkShadow = darken($controlShadow,15%) +DarkenedFontColor = #091E40 +defaultBorderColor = #DADEE7 +defaultHighlightBorderColor = #2576EF +defaultBorderFocusShadow = $defaultBorderColor +defaultBorderFocusWidth = 0 +brand.normal=#2576EF +color.brand4=#84B1F6 +default.background = @background +background.normal=#FFFFFF +text.white=#ffffff +text.placeholder=fade(@foreground, 40%) +text.highlight=#F9AE31 +menu.hover=#DADEE7 +fill.hover=#E6E9EF +fill.click=#DADEE7 +fill.normal=#FFFFFF +fill.gray=#F2F4F8 +fill.disabled=#F2F4F8 +border.divider=#DADEE7 +tooltip.normal=#3F506A +tooltip.disabled=#A3ADBD +hover.deep=#e2fbe6 +fill.deep=#F6F9FE + +#---- Button ---- + +Button.border =com.fine.theme.light.ui.FineButtonBorder +Button.arc = 6 +Button.minimumWidth = 0 +Button.margin = 2,12,2,12 +Button.iconTextGap = 4 +Button.rollover = true +Button.defaultButtonFollowsFocus = false +Button.borderWidth = 1 +Button.medium.margin = 2,12,2,12 +Button.small.margin = 0,10,0,10 + +Button.background = @buttonBackground +Button.focusedBackground = @buttonBackground +Button.hoverBackground = $fill.hover +Button.pressedBackground = $fill.click +Button.selectedBackground = $fill.click +Button.selectedForeground = $Button.foreground +Button.disabledSelectedBackground = darken($Button.background,13%,derived) +Button.disabledBackground = $fill.disabled + +Button.borderColor = $Component.borderColor +Button.disabledBorderColor = $Component.disabledBorderColor +Button.focusedBorderColor = $border.divider +Button.hoverBorderColor = $border.divider + +Button.innerFocusWidth = 0 + +Button.text.background = $Button.background +Button.text.foreground = $Button.foreground +Button.text.focusedBackground = $Button.focusedBackground +Button.text.hoverBackground = darken($Button.default.background,3%,derived) +Button.text.pressedBackground = darken($Button.default.background,10%,derived) +Button.text.borderColor = @accentButtonDefaultBorderColor +Button.text.hoverBorderColor = $Button.hoverBorderColor +Button.text.focusedBorderColor = $Button.focusedBorderColor +Button.text.focusColor = $Component.focusColor +Button.text.borderWidth = 2 + + + +Button.default.background = $Button.background +Button.default.foreground = $Button.foreground +Button.default.focusedBackground = $Button.focusedBackground +Button.default.hoverBackground = darken($Button.default.background,3%,derived) +Button.default.pressedBackground = darken($Button.default.background,10%,derived) +Button.default.borderColor = @accentButtonDefaultBorderColor +Button.default.hoverBorderColor = $Button.hoverBorderColor +Button.default.focusedBorderColor = $Button.focusedBorderColor +Button.default.focusColor = $Component.focusColor +Button.default.borderWidth = 1 + +Button.toolbar.background = #fff +Button.toolbar.hoverBackground = $fill.hover +Button.toolbar.pressedBackground = $fill.click +Button.toolbar.selectedBackground = $fill.click +Button.toolbar.margin = 4,4,4,4 +Button.toolbar.borderWidth = 0 +Button.toolbar.spacingInsets = 0,0,0,0 + +Button.group.background = #FFF +Button.group.selectedBackground = #2576EF +Button.group.pressedBackground = #2576EF +Button.group.selectedForeground = #FFF +Button.group.pressedForeground = #FFF +Button.group.minimumWidth = 32 +Button.group.minimumHeight = 20 +Button.group.arc = $Component.arc + +Button.tab.hoverBackground = darken($Button.background,12%,derived) +#Button.tab.pressedBackground = #DEEAFD +Button.tab.selectedBackground = #DEEAFD +Button.tab.margin = 3,3,3,3 +Button.tab.spacingInsets = 1,2,1,2 + +CombinationButton.background = $Button.background +CombinationButton.borderColor = $Component.borderColor +CombinationButton.arc = $Button.arc + + +#---- CheckBox ---- +CheckBox.arc = 4 +CheckBox.margin = 2,0,2,0 +CheckBox.iconTextGap = 4 +CheckBox.rollover = true + +CheckBox.icon.focusWidth = 1 + +# enabled +CheckBox.icon.borderColor = #B8BFCB +CheckBox.icon.background = @buttonBackground +CheckBox.icon.selectedBorderColor = $CheckBox.icon.checkmarkColor +CheckBox.icon.selectedBackground = $CheckBox.icon.background +CheckBox.icon.checkmarkColor = @accentCheckmarkColor + +# disabled +CheckBox.icon.disabledBorderColor = tint($CheckBox.icon.borderColor,20%) +CheckBox.icon.disabledBackground = @disabledBackground +CheckBox.icon.disabledCheckmarkColor = lighten(changeSaturation($CheckBox.icon.checkmarkColor,0%),5%) + +# focused +CheckBox.icon.focusedBorderColor = shade($Component.focusedBorderColor,10%) +CheckBox.icon.focusedBackground = changeLightness($Component.focusColor,95%) + +# hover +CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor +CheckBox.icon.hoverBackground = darken($CheckBox.icon.background,3%,derived) + +# pressed +CheckBox.icon.pressedBorderColor = $CheckBox.icon.focusedBorderColor +CheckBox.icon.pressedBackground = darken($CheckBox.icon.background,10%,derived) + + +# used if CheckBox.icon.style or RadioButton.icon.style = filled +# enabled +CheckBox.icon[filled].selectedBorderColor = shade($CheckBox.icon[filled].selectedBackground,5%) +CheckBox.icon[filled].selectedBackground = @accentCheckmarkColor +CheckBox.icon[filled].checkmarkColor = @buttonBackground +# focused +CheckBox.icon[filled].focusedSelectedBorderColor = tint($CheckBox.icon[filled].selectedBackground,50%) +CheckBox.icon[filled].focusedSelectedBackground = $CheckBox.icon[filled].selectedBackground +CheckBox.icon[filled].focusedCheckmarkColor = $CheckBox.icon.focusedBackground +# hover +CheckBox.icon[filled].hoverSelectedBackground = darken($CheckBox.icon[filled].selectedBackground,5%,derived) +# pressed +CheckBox.icon[filled].pressedSelectedBackground = darken($CheckBox.icon[filled].selectedBackground,10%,derived) + + +#---- CheckBoxMenuItem ---- + +CheckBoxMenuItem.icon.checkmarkColor = @accentCheckmarkColor +CheckBoxMenuItem.icon.disabledCheckmarkColor = @buttonDisabledArrowColor +CheckBoxMenuItem.border = com.formdev.flatlaf.ui.FlatMenuItemBorder +CheckBoxMenuItem.checkIcon = com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon +CheckBoxMenuItem.arrowIcon = com.formdev.flatlaf.icons.FlatMenuItemArrowIcon +CheckBoxMenuItem.margin = @menuItemMargin +CheckBoxMenuItem.opaque = false +CheckBoxMenuItem.borderPainted = true +CheckBoxMenuItem.background = @menuBackground + +#---- ColorChooser ---- + +ColorChooser.swatchesSwatchSize = {scaledDimension}16,16 +ColorChooser.swatchesRecentSwatchSize = {scaledDimension}16,16 +ColorChooser.swatchesDefaultRecentColor = $control + + +#---- ComboBox ---- + +ComboBox.border = com.fine.theme.light.ui.FineRoundBorder +ComboBox.padding = @componentMargin +ComboBox.minimumWidth = 72 +ComboBox.editorColumns = 0 +ComboBox.maximumRowCount = 15 +[mac]ComboBox.showPopupOnNavigation = true +# allowed values: auto, button or none +ComboBox.buttonStyle = auto +ComboBox.background = #FFF +ComboBox.buttonBackground = $ComboBox.background +ComboBox.buttonEditableBackground = darken($ComboBox.background,2%) +ComboBox.buttonSeparatorColor = $ComboBox.background +ComboBox.buttonDisabledSeparatorColor = $Component.disabledBorderColor +ComboBox.buttonArrowColor = @buttonArrowColor +ComboBox.buttonDisabledArrowColor = #a5acb7 +ComboBox.buttonHoverArrowColor = #0A1C38 +ComboBox.buttonPressedArrowColor = #0A1C38 + +ComboBox.popupInsets = 0,0,0,0 +ComboBox.selectionInsets = 0,0,0,0 +ComboBox.selectionArc = 0 +ComboBox.borderCornerRadius = 3 +ComboBox.comboHeight = 24 +ComboBox.selectBox.button.height = 22 + +#---- Component ---- + +Component.focusWidth = 0 +Component.innerFocusWidth = 0.5 +Component.innerOutlineWidth = 1 +Component.borderWidth = 1 +Component.arc = 5 +Component.minimumWidth = 64 +# allowed values: chevron or triangle +Component.arrowType = chevron +Component.hideMnemonics = true + +Component.borderColor = $defaultBorderColor +Component.disabledBorderColor = $defaultBorderColor +Component.focusedBorderColor = shade($Component.focusColor,10%) +Component.focusColor = @accentFocusColor +Component.linkColor = @accentLinkColor +Component.accentColor = if(@accentColor, @accentColor, @accentBaseColor) +Component.grayFilter = 25,-25,100 + +Component.error.borderColor = lighten(desaturate($Component.error.focusedBorderColor,20%),25%) +Component.error.focusedBorderColor = #e53e4d +Component.warning.borderColor = lighten(saturate($Component.warning.focusedBorderColor,25%),20%) +Component.warning.focusedBorderColor = #e2a53a +Component.custom.borderColor = lighten(desaturate(#f00,20%,derived noAutoInverse),25%,derived noAutoInverse) + + +#---- Desktop ---- + +Desktop.background = #E6EBF0 + +#---- DesktopIcon ---- + +DesktopIcon.background = darken($Desktop.background,10%,derived) +DesktopIcon.border = 4,4,4,4 +DesktopIcon.iconSize = 64,64 +DesktopIcon.closeSize = 20,20 +DesktopIcon.closeIcon = com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon + +#---- EditorPane ---- + +EditorPane.border = com.formdev.flatlaf.ui.FlatMarginBorder +EditorPane.margin = @componentMargin +EditorPane.background = @componentBackground +DataBindingEditor.vgap=$Component.defaultVGap +DataBindingEditor.hgap=1 +DataBindingEditor.height=$Component.defaultHeight + +#---- FileChooser ---- + +FileChooser.newFolderIcon = com.formdev.flatlaf.icons.FlatFileChooserNewFolderIcon +FileChooser.upFolderIcon = com.formdev.flatlaf.icons.FlatFileChooserUpFolderIcon +FileChooser.homeFolderIcon = com.formdev.flatlaf.icons.FlatFileChooserHomeFolderIcon +FileChooser.detailsViewIcon = com.formdev.flatlaf.icons.FlatFileChooserDetailsViewIcon +FileChooser.listViewIcon = com.formdev.flatlaf.icons.FlatFileChooserListViewIcon +FileChooser.usesSingleFilePane = true +[win]FileChooser.useSystemExtensionHiding = true + + +#---- FileView ---- + +FileView.directoryIcon = com.formdev.flatlaf.icons.FlatFileViewDirectoryIcon +FileView.fileIcon = com.formdev.flatlaf.icons.FlatFileViewFileIcon +FileView.computerIcon = com.formdev.flatlaf.icons.FlatFileViewComputerIcon +FileView.hardDriveIcon = com.formdev.flatlaf.icons.FlatFileViewHardDriveIcon +FileView.floppyDriveIcon = com.formdev.flatlaf.icons.FlatFileViewFloppyDriveIcon +FileView.fullRowSelection = true + + +#---- FormattedTextField ---- + +FormattedTextField.border = com.formdev.flatlaf.ui.FlatTextBorder +FormattedTextField.margin = @componentMargin +FormattedTextField.background = @componentBackground +FormattedTextField.selectionBackground=$color.brand4 +FormattedTextField.placeholderForeground = @disabledForeground +FormattedTextField.iconTextGap = 4 + +# ---- Label ---- +Label.tipColor = @BrandTipColor +Label.borderColor = $defaultBorderColor +Label.hyperLinkColor = #2576EF +Label.strongHintColor = #FF0000 +Label.warningColor = #F1393C +Label.secondaryColor = #0A1C38A8 + +#---- HelpButton ---- + +HelpButton.questionMarkColor = @accentCheckmarkColor +HelpButton.disabledQuestionMarkColor = shade(@background,30%) + +HelpButton.icon = com.formdev.flatlaf.icons.FlatHelpButtonIcon +HelpButton.borderColor = $Button.borderColor +HelpButton.disabledBorderColor = $Button.disabledBorderColor +HelpButton.focusedBorderColor = $Button.focusedBorderColor +HelpButton.hoverBorderColor = $?Button.hoverBorderColor +HelpButton.background = $Button.background +HelpButton.disabledBackground = $Button.disabledBackground +HelpButton.focusedBackground = $?Button.focusedBackground +HelpButton.hoverBackground = $?Button.hoverBackground +HelpButton.pressedBackground = $?Button.pressedBackground + +HelpButton.borderWidth = $?Button.borderWidth +HelpButton.innerFocusWidth = $?Button.innerFocusWidth + +#---- List ---- + +List.border = 4,0,4,0 +List.cellMargins = 1,12,1,12 +List.selectionInsets = 0,4,0,4 +List.selectionArc = 2 +List.cellFocusColor = @cellFocusColor +List.selectionBackground = fade(#2576EF,12%) +List.cellNoFocusBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Default +List.focusCellHighlightBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Focused +List.focusSelectedCellHighlightBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Selected +List.background = @componentBackground +List.selectionInactiveBackground = @selectionBackground +List.selectionInactiveForeground = @selectionInactiveForeground +List.dropCellBackground = @dropCellBackground +List.dropCellForeground = @dropCellForeground +List.dropLineColor = @dropLineColor +List.showCellFocusIndicator = false +List.cellRender.background = #FFF +List.cellRender.button.width = 28 +List.cellRender.button.height = 24 +List.wrapper.text.fontColor = #0a1c3877 +#---- Menu ---- + +Menu.icon.arrowColor = @buttonArrowColor +Menu.icon.disabledArrowColor = @buttonDisabledArrowColor + +Menu.border = com.formdev.flatlaf.ui.FlatMenuItemBorder +Menu.arrowIcon = com.formdev.flatlaf.icons.FlatMenuArrowIcon +Menu.checkIcon = null +Menu.margin=3,10,3,10 +Menu.submenuPopupOffsetX = {scaledInteger}-4 +Menu.submenuPopupOffsetY = {scaledInteger}-4 +Menu.opaque = false +Menu.borderPainted = true +Menu.background = @menuBackground +Menu.selectionBackground=$menu.hover +#Menu.selectionForeground=$text.white +#Menu.acceleratorForeground=@foreground +#Menu.acceleratorSelectionForeground=$text.white + +#---- MenuBar ---- + +MenuBar.borderColor = $Separator.foreground +MenuBar.border = com.formdev.flatlaf.ui.FlatMenuBarBorder +MenuBar.background=#eaeff5 +MenuBar.hoverBackground = @menuHoverBackground +MenuBar.itemMargins = 3,8,3,8 +MenuBar.selectionInsets = $MenuItem.selectionInsets +MenuBar.selectionEmbeddedInsets = $MenuItem.selectionInsets +MenuBar.selectionArc = $MenuItem.selectionArc + +#---- MenuItem ---- + +MenuItem.border = com.formdev.flatlaf.ui.FlatMenuItemBorder +MenuItem.arrowIcon = com.formdev.flatlaf.icons.FlatMenuItemArrowIcon +MenuItem.checkIcon = null +MenuItem.margin=3,10,3,10 +MenuItem.opaque = false +MenuItem.borderPainted = true +MenuItem.verticallyAlignText = true +MenuItem.background = @menuBackground +MenuItem.checkBackground = @menuCheckBackground +MenuItem.checkMargins = 2,2,2,2 +MenuItem.minimumWidth=150 +MenuItem.minimumIconSize = 16,16 +MenuItem.iconTextGap = 6 +MenuItem.textAcceleratorGap = 24 +MenuItem.textNoAcceleratorGap = 6 +MenuItem.acceleratorArrowGap=4 +MenuItem.acceleratorDelimiter = "+" +MenuItem.acceleratorForeground=@foreground +MenuItem.acceleratorSelectionForeground=@foreground +[mac]MenuItem.acceleratorDelimiter = "" +MenuItem.selectionInsets=0,4,0,4 +MenuItem.selectionArc=4 +MenuItem.selectionBackground=#E6E9EF +MenuItem.selectionForeground=@foreground +MenuItem.disabledForeground=fade(@foreground,29%) + +# for MenuItem.selectionType = underline +MenuItem.underlineSelectionBackground = @menuHoverBackground +MenuItem.underlineSelectionCheckBackground = @menuCheckBackground +MenuItem.underlineSelectionColor = @accentUnderlineColor +MenuItem.underlineSelectionHeight = 3 +#---- Separator ---- +Separator.background=$border.divider + +#---- OptionPane ---- + +OptionPane.border = 12,12,12,12 +OptionPane.messageAreaBorder = 0,0,0,0 +OptionPane.buttonAreaBorder = 12,0,0,0 +OptionPane.messageForeground = null + +OptionPane.showIcon = false +OptionPane.maxCharactersPerLine = 80 +OptionPane.iconMessageGap = 16 +OptionPane.messagePadding = 3 +OptionPane.buttonPadding = 8 +OptionPane.buttonMinimumWidth = {scaledInteger}72 +OptionPane.sameSizeButtons = true +OptionPane.setButtonMargin = false +OptionPane.buttonOrientation = 4 +[mac]OptionPane.isYesLast = true + +OptionPane.errorIcon = com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon +OptionPane.informationIcon = com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon +OptionPane.questionIcon = com.formdev.flatlaf.icons.FlatOptionPaneQuestionIcon +OptionPane.warningIcon = com.formdev.flatlaf.icons.FlatOptionPaneWarningIcon + +#---- SortPane ---- +SortPane.height = 24 +SortPane.vGap = 4 +SortPane.hGap = 14 + +#---- PasswordField ---- + +PasswordField.capsLockIconColor = #00000064 +PasswordField.revealIconColor = tint(@foreground,40%) +PasswordField.border = com.formdev.flatlaf.ui.FlatTextBorder +PasswordField.margin = @componentMargin +PasswordField.background = $fill.normal +PasswordField.placeholderForeground = @disabledForeground +PasswordField.iconTextGap = 4 +PasswordField.echoChar = \u2022 +PasswordField.showCapsLock = true +PasswordField.showRevealButton = false +PasswordField.capsLockIcon = com.formdev.flatlaf.icons.FlatCapsLockIcon +PasswordField.revealIcon = com.formdev.flatlaf.icons.FlatRevealIcon + + +#---- Popup ---- + +Popup.borderCornerRadius = 4 +Popup.dropShadowPainted = true +Popup.dropShadowInsets = -4,-4,4,4 +Popup.dropShadowColor = #000 +Popup.dropShadowOpacity = 0.15 +PopupToolPane.height=34 +PopupToolPane.borderInsets=0, 10, 0, 10 + +#---- PopupMenu ---- +PopupMenu.border=com.fine.theme.light.ui.FinePopupMenuBorder +PopupMenu.borderInsets=10,0,10,0 +PopupMenu.borderCornerRadius = $Popup.borderCornerRadius +PopupMenu.background=$background.normal +PopupMenu.scrollArrowColor = @buttonArrowColor +PopupMenu.borderColor=$border.divider +PopupMenu.hoverScrollArrowBackground = darken(@background,5%) +PopupMenu.arc=10 + +#---- PopupMenuSeparator ---- +PopupMenuSeparator.height=5 +PopupMenuSeparator.stripeWidth = 1 +PopupMenuSeparator.stripeIndent=2 +PopupMenuSeparator.Insets=0,10,0,10 + + +#---- ProgressBar ---- + +ProgressBar.border = com.formdev.flatlaf.ui.FlatEmptyBorder +ProgressBar.arc = 10 +ProgressBar.horizontalSize = 146,4 +ProgressBar.verticalSize = 4,146 +ProgressBar.cycleTime = 4000 +ProgressBar.repaintInterval = 15 +ProgressBar.font = -2 +ProgressBar.background = #E8E8E9 +ProgressBar.foreground = #419BF9 +ProgressBar.selectionBackground = @foreground +ProgressBar.selectionForeground = contrast($ProgressBar.foreground, @foreground, @componentBackground) + + +#---- RadioButton ---- + +RadioButton.border = com.formdev.flatlaf.ui.FlatMarginBorder +RadioButton.icon = com.fine.theme.icon.icons.AnimatedRadioButtonIcon +RadioButton.icon.centerDiameter = 8 +RadioButton.icon[filled].centerDiameter = 5 +RadioButton.margin = 2,2,2,2 +RadioButton.iconTextGap = 4 +RadioButton.vGap = 4 +RadioButton.rollover = true + + +#---- RadioButtonMenuItem ---- + +RadioButtonMenuItem.border = com.formdev.flatlaf.ui.FlatMenuItemBorder +RadioButtonMenuItem.checkIcon = com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon +RadioButtonMenuItem.arrowIcon = com.formdev.flatlaf.icons.FlatMenuItemArrowIcon +RadioButtonMenuItem.margin = @menuItemMargin +RadioButtonMenuItem.opaque = false +RadioButtonMenuItem.borderPainted = true +RadioButtonMenuItem.background = @menuBackground + + +#---- RootPane ---- + +RootPane.border = com.formdev.flatlaf.ui.FlatRootPaneUI$FlatWindowBorder +RootPane.borderDragThickness = 5 +RootPane.cornerDragWidth = 16 +RootPane.honorFrameMinimumSizeOnResize = false +RootPane.honorDialogMinimumSizeOnResize = true +RootPane.activeBorderColor = darken(@background,50%,derived) +RootPane.inactiveBorderColor = darken(@background,30%,derived) + + +#---- ScrollBar ---- + +ScrollBar.width = 10 +ScrollBar.minimumButtonSize = 12,12 +ScrollBar.minimumThumbSize = 100,100 +ScrollBar.maximumThumbSize = 100000,100000 +ScrollBar.trackInsets = 0,0,0,0 +ScrollBar.thumbInsets = 0,2,0,2 +ScrollBar.trackArc = 0 +ScrollBar.thumbArc = 999 +ScrollBar.hoverThumbWithTrack = false +ScrollBar.pressedThumbWithTrack = false +ScrollBar.showButtons = false +ScrollBar.squareButtons = false +ScrollBar.buttonArrowColor = @buttonArrowColor +ScrollBar.buttonDisabledArrowColor = @buttonDisabledArrowColor +ScrollBar.allowsAbsolutePositioning = true + +[mac]ScrollBar.minimumThumbSize = 6,12 +[mac]ScrollBar.thumbInsets = 0,2,0,2 +[mac]ScrollBar.thumbArc = 999 +[mac]ScrollBar.hoverThumbWithTrack = true + +[linux]ScrollBar.minimumThumbSize = 6,12 +[linux]ScrollBar.thumbInsets = 2,0,2,0 +[linux]ScrollBar.thumbArc = 999 + +ScrollBar.track = #00000000 +ScrollBar.thumb = #0a1c3833 +ScrollBar.hoverTrackColor = fade(@background, 0%) +ScrollBar.hoverThumbColor = darken($ScrollBar.thumb,10%,derived noAutoInverse) +ScrollBar.pressedThumbColor = #0a1c3849 +ScrollBar.hoverButtonBackground = darken(@background,5%,derived noAutoInverse) +ScrollBar.pressedButtonBackground = darken(@background,10%,derived noAutoInverse) + +ScrollBar.largeBar.width = 16 +ScrollBar.largeBar.track = #FFF +ScrollBar.largeBar.showButtons = true +ScrollBar.largeBar.thumbInsets = 0,4,0,4 +ScrollBar.largeBar.buttonBackground = $ScrollBar.track + +#---- Panel ---- +Panel.arc = 10 + +#---- ScrollPane ---- + +ScrollPane.border = null +ScrollPane.background = $ScrollBar.track +ScrollPane.fillUpperCorner = true +ScrollPane.smoothScrolling = true + + +#---- SearchField ---- + +SearchField.searchIconColor = fade(Actions.GreyInline,90%,lazy) +SearchField.searchIconHoverColor = fade(Actions.GreyInline,70%,lazy) +SearchField.searchIconPressedColor = fade(Actions.GreyInline,50%,lazy) + +SearchField.clearIconColor = fade(Actions.GreyInline,50%,lazy) +SearchField.clearIconHoverColor = $SearchField.clearIconColor +SearchField.clearIconPressedColor = fade(Actions.GreyInline,80%,lazy) +#---- SearchPanel ---- +SearchPanel.labelBorderInsets=3, 6, 3, 4 +SearchPanel.buttonBorderInsets=4, 4, 4, 4 +TreeSearchToolbarPane.borderInsets=0, 8, 0, 8 + +#---- Separator ---- + +Separator.height = 3 +Separator.stripeWidth = 1 +Separator.stripeIndent = 1 +Separator.foreground=$fill.hover + + +#---- Slider ---- + +Slider.focusInsets = 0,0,0,0 +Slider.trackWidth = 2 +Slider.thumbSize = 12,12 +Slider.focusWidth=0 +Slider.trackValueColor=$brand.normal +Slider.trackColor=$border.divider +Slider.thumbColor=$fill.normal +Slider.thumbBorderColor=$border.divider +Slider.tickColor = @disabledForeground +Slider.focusedColor=$border.divider +Slider.focusedThumbBorderColor=$border.divider +Slider.hoverThumbColor=$fill.hover +Slider.pressedThumbColor=$fill.hover +Slider.disabledTrackColor = darken(@background,13%) +Slider.disabledThumbColor = $Slider.disabledTrackColor +Slider.labelHeight=13 +#---- FormSliderPane ---- +FormSliderPane.showValueWidth=40 +FormSliderPane.showValueHeight=20 +FormSliderPane.sliderWidth=220 +FormSliderPane.sliderHeight=20 +#---- GradientBar ---- +GradientBar.borderColor=$border.divider +GradientBar.thumbBorderColor=$border.divider +GradientBar.borderWidth=1 +GradientBar.pressedThumbColor=@BrandColor +GradientBar.hoverThumbColor=@BrandColor +GradientBar.thumbWidth=12 +GradientBar.recWidth=160 +GradientBar.recHeight=30 + + + +#---- Spinner ---- + +Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder +Spinner.background = $fill.normal +Spinner.buttonBackground = $fill.normal +Spinner.buttonSeparatorColor = $Component.borderColor +Spinner.buttonDisabledSeparatorColor = $Component.disabledBorderColor +Spinner.buttonArrowColor = @buttonArrowColor +Spinner.buttonDisabledArrowColor = @buttonDisabledArrowColor +Spinner.buttonHoverArrowColor = @buttonHoverArrowColor +Spinner.buttonPressedArrowColor = @buttonPressedArrowColor +Spinner.padding = @componentMargin +Spinner.editorBorderPainted = false +# allowed values: button or none +Spinner.buttonStyle = button +#---- Input ---- +InputButton.width=$Component.defaultHeight +InputButton.height=$Component.defaultHeight +InputTextField.borderInsets=0, 6, 0, 6 +Input.border=com.fine.theme.light.ui.FineRoundBorder +Input.background=$fill.normal +Input.disabledBackground=$fill.disabled +Input.height=$Component.defaultHeight +Input.arc=$Component.arc +#---- FormulaPane ---- +FormulaPane.buttonWidth=$Component.defaultHeight +FormulaPane.buttonHeight=$Component.defaultHeight + +#---- SplitPane ---- + +SplitPane.dividerSize = 5 +SplitPane.continuousLayout = true +SplitPane.border = null +# \u5F71\u54CD\u89C6\u89C9\u6548\u679C\uFF0C\u4E34\u65F6\u5148\u5173\u6389 +SplitPane.supportsOneTouchButtons = false +SplitPane.centerOneTouchButtons = true +SplitPane.oneTouchButtonSize = {scaledInteger}6 +SplitPane.oneTouchButtonOffset = {scaledInteger}2 + +SplitPaneDivider.border = null +SplitPaneDivider.oneTouchArrowColor = @buttonArrowColor +SplitPaneDivider.oneTouchHoverArrowColor = @buttonHoverArrowColor +SplitPaneDivider.oneTouchPressedArrowColor = @buttonPressedArrowColor +# allowed values: grip or plain +SplitPaneDivider.style = grip +SplitPaneDivider.gripColor = @icon +SplitPaneDivider.gripDotCount = 3 +SplitPaneDivider.gripDotSize = 3 +SplitPaneDivider.gripGap = 2 +SplitPaneDivider.draggingColor = $Component.borderColor + + +#---- TabbedPane ---- + +TabbedPane.tabHeight = 30 +TabbedPane.tabSelectionHeight = 0 +TabbedPane.cardTabSelectionHeight = 0 +TabbedPane.tabArc = 0 +TabbedPane.tabSelectionArc = 0 +TabbedPane.cardTabArc = 12 +TabbedPane.selectedInsets = 10,0,0,0 +TabbedPane.tabSelectionInsets = 0,0,0,0 +TabbedPane.contentSeparatorHeight = 1 +TabbedPane.showTabSeparators = true +TabbedPane.tabSeparatorsFullHeight = false +TabbedPane.hasFullBorder = false +TabbedPane.tabInsets = 4,6,4,6 +TabbedPane.tabAreaInsets = 0,0,0,0 +TabbedPane.selectedTabPadInsets = 0,0,0,0 +TabbedPane.tabRunOverlay = 0 +TabbedPane.tabsOverlapBorder = false +TabbedPane.disabledForeground = @disabledForeground +TabbedPane.shadow = @background +TabbedPane.contentBorderInsets = null +TabbedPane.background = $fill.disabled +TabbedPane.selectedBackground = #fff +TabbedPane.tabSeparatorColor = $border.divider +# allowed values: moreTabsButton or arrowButtons +TabbedPane.hiddenTabsNavigation = moreTabsButton +# allowed values: leading, trailing, center or fill +TabbedPane.tabAreaAlignment = leading +# allowed values: leading, trailing or center +TabbedPane.tabAlignment = center +# allowed values: preferred, equal or compact +TabbedPane.tabWidthMode = preferred + +# allowed values: underlined or card +TabbedPane.tabType = underlined + +# allowed values: chevron or triangle +TabbedPane.arrowType = chevron +TabbedPane.buttonInsets = 2,1,2,1 +TabbedPane.buttonArc = $Button.arc + +# allowed values: wrap or scroll +#TabbedPane.tabLayoutPolicy = scroll +# allowed values: never or asNeeded +TabbedPane.tabsPopupPolicy = asNeeded +# allowed values: never, asNeeded or asNeededSingle +TabbedPane.scrollButtonsPolicy = asNeededSingle +# allowed values: both or trailing +TabbedPane.scrollButtonsPlacement = both + +TabbedPane.closeIcon = com.formdev.flatlaf.icons.FlatTabbedPaneCloseIcon +TabbedPane.closeSize = 16,16 +TabbedPane.closeArc = 4 +TabbedPane.closeCrossPlainSize = 7.5 +TabbedPane.closeCrossFilledSize = $TabbedPane.closeCrossPlainSize +TabbedPane.closeCrossLineWidth = 1 + +TabbedPane.underlineColor = @accentUnderlineColor +TabbedPane.inactiveUnderlineColor = mix(@accentUnderlineColor,$TabbedPane.background,50%) +TabbedPane.disabledUnderlineColor = darken(@background,28%) +TabbedPane.hoverColor = $fill.hover +TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,10%) +TabbedPane.contentAreaColor = $fill.hover + +TabbedPane.buttonHoverBackground = darken($TabbedPane.background,7%,derived) +TabbedPane.buttonPressedBackground = darken($TabbedPane.background,10%,derived) + +TabbedPane.closeBackground = null +TabbedPane.closeForeground = @disabledForeground +TabbedPane.closeHoverBackground = $hover.deep +TabbedPane.closeHoverForeground = @foreground +TabbedPane.closePressedBackground = darken($TabbedPane.background,25%,derived) +TabbedPane.closePressedForeground = $TabbedPane.closeHoverForeground + +#---- TemplateTabPane ---- +TemplateTabPane.tabHeight = 30 +TemplateTabPane.tabSelectionHeight = 0 +TemplateTabPane.cardTabSelectionHeight = 0 +TemplateTabPane.selectedInsets = 10,0,0,0 +TemplateTabPane.hoverColor = $fill.hover +TemplateTabPane.contentAreaColor = $fill.hover +TemplateTabPane.background = $fill.disabled +TemplateTabPane.selectedBackground = #fff +TemplateTabPane.borderColor = $border.divider +TemplateTabPane.closeHoverBackground = $hover.deep +TemplateTabPane.tabInsets = 4,6,4,6 +TemplateTabPane.borderWidth = 1 +TemplateTabPane.tabArc = 5 +TemplateTabPane.separatorHeight = 14 +TemplateTabPane.icon.hoverBackground = #B8BFCB + +# ---- FineTabbedPane ---- +FineTabbedPane.background = #F2F4F8 + +#---- Table ---- + +Table.rowHeight = 20 +Table.showHorizontalLines = false +Table.showVerticalLines = false +Table.showTrailingVerticalLine = false +Table.consistentHomeEndKeyBehavior = true +Table.intercellSpacing = 0,0 +Table.scrollPaneBorder = com.formdev.flatlaf.ui.FlatBorder +Table.ascendingSortIcon = com.formdev.flatlaf.icons.FlatAscendingSortIcon +Table.descendingSortIcon = com.formdev.flatlaf.icons.FlatDescendingSortIcon +Table.sortIconColor = @icon +Table.cellMargins = 2,6,2,3 +Table.cellFocusColor = @cellFocusColor +Table.cellNoFocusBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Default +Table.focusCellHighlightBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Focused +Table.focusSelectedCellHighlightBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Selected +Table.focusCellBackground = $Table.background +Table.focusCellForeground = $Table.foreground +Table.background = $fill.normal +Table.selectionInactiveBackground = @selectionInactiveBackground +Table.selectionInactiveForeground = @selectionInactiveForeground +Table.selectionBackground = fade(#2576EF,12%) +Table.dropCellBackground = @dropCellBackground +Table.dropCellForeground = @dropCellForeground +Table.dropLineColor = @dropLineColor +Table.dropLineShortColor = @dropLineShortColor +Table.gridColor = darken($Table.background,8%) +Table.default.background = $default.background + + +#---- TableHeader ---- + +TableHeader.height = 25 +TableHeader.cellBorder = com.formdev.flatlaf.ui.FlatTableHeaderBorder +TableHeader.cellMargins = 2,6,2,3 +TableHeader.focusCellBackground = $TableHeader.background +TableHeader.background = @componentBackground +TableHeader.showTrailingVerticalLine = false +TableHeader.hoverBackground = darken($TableHeader.background,5%,derived) +TableHeader.pressedBackground = darken($TableHeader.background,10%,derived) +TableHeader.separatorColor = darken($TableHeader.background,10%) +TableHeader.bottomSeparatorColor = $TableHeader.separatorColor + + +#---- TextArea ---- +TextArea.border=com.fine.theme.light.ui.FineRoundBorder +TextArea.margin = @componentMargin +TextArea.background=$background.normal +TextArea.height=$Component.defaultHeight +TextArea.selectionBackground=$color.brand4 +TextArea.selectionForeground=$text.white +TextArea.inactiveForeground=fade(@foreground, 29%) +TextArea.disabledBackground=$fill.disabled + + +#---- TextComponent ---- + +# allowed values: never, once or always +TextComponent.selectAllOnFocusPolicy = once +TextComponent.selectAllOnMouseClick = false +TextComponent.arc=$Component.arc + + +#---- TextField ---- +TextField.border=com.fine.theme.light.ui.FineRoundBorder +TextField.margin = @componentMargin +TextField.background=$background.normal +TextField.selectionBackground=$color.brand4 +TextField.selectionForeground=$text.white +TextField.inactiveForeground=fade(@foreground, 29%) +TextField.disabledBackground=$fill.disabled +TextField.inactiveBackground=$fill.disabled +TextField.placeholderForeground = @disabledForeground +TextField.iconTextGap = 4 +TextField.height=$Component.defaultHeight + + + +#---- TextPane ---- + +TextPane.border = com.formdev.flatlaf.ui.FlatMarginBorder +TextPane.margin = @componentMargin +TextPane.background = @componentBackground + + +#---- TitledBorder ---- + +TitledBorder.titleColor = @foreground +TitledBorder.border = 1,1,1,1,$Separator.foreground + +#---- TitlePane ---- + +TitlePane.useWindowDecorations = true +TitlePane.menuBarEmbedded = true +TitlePane.unifiedBackground = true +TitlePane.showIcon = true +TitlePane.showIconInDialogs = true +TitlePane.noIconLeftGap = 8 +TitlePane.iconSize = 16,16 +TitlePane.iconMargins = 3,8,3,8 +TitlePane.titleMargins = 3,0,3,0 +TitlePane.titleMinimumWidth = 60 +TitlePane.buttonSize = 44,30 +TitlePane.buttonMinimumWidth = 30 +TitlePane.buttonMaximizedHeight = 22 +TitlePane.buttonSymbolHeight = 10 +TitlePane.centerTitle = false +TitlePane.centerTitleIfMenuBarEmbedded = true +TitlePane.showIconBesideTitle = false +TitlePane.menuBarTitleGap = 40 +TitlePane.menuBarTitleMinimumGap = 12 +TitlePane.menuBarResizeHeight = 4 +TitlePane.closeIcon = com.formdev.flatlaf.icons.FlatWindowCloseIcon +TitlePane.iconifyIcon = com.formdev.flatlaf.icons.FlatWindowIconifyIcon +TitlePane.maximizeIcon = com.formdev.flatlaf.icons.FlatWindowMaximizeIcon +TitlePane.restoreIcon = com.formdev.flatlaf.icons.FlatWindowRestoreIcon + +TitlePane.background = $MenuBar.background +TitlePane.inactiveBackground = $TitlePane.background +TitlePane.foreground = @foreground +TitlePane.inactiveForeground = @disabledForeground + +TitlePane.closeHoverBackground = #c42b1c +TitlePane.closePressedBackground = fade($TitlePane.closeHoverBackground,90%) +TitlePane.closeHoverForeground = #fff +TitlePane.closePressedForeground = #fff + +# window style "small" +TitlePane.small.font = -1 +TitlePane.small.showIcon = false +TitlePane.small.buttonSize = 30,20 +TitlePane.small.buttonSymbolHeight = 8 +TitlePane.small.closeIcon = com.formdev.flatlaf.icons.FlatWindowCloseIcon, small +TitlePane.small.iconifyIcon = com.formdev.flatlaf.icons.FlatWindowIconifyIcon, small +TitlePane.small.maximizeIcon = com.formdev.flatlaf.icons.FlatWindowMaximizeIcon, small +TitlePane.small.restoreIcon = com.formdev.flatlaf.icons.FlatWindowRestoreIcon, small + +TitlePane.embeddedForeground = lighten($TitlePane.foreground,35%) +TitlePane.buttonHoverBackground = darken($TitlePane.background,10%,derived) +TitlePane.buttonPressedBackground = darken($TitlePane.background,8%,derived) + + +#---- ToggleButton ---- + +ToggleButton.border = $Button.border +ToggleButton.margin = $Button.margin +ToggleButton.compact.margin = 2,0,2,0 +ToggleButton.iconTextGap = $Button.iconTextGap +ToggleButton.rollover = $Button.rollover +ToggleButton.background = $Button.background +ToggleButton.pressedBackground = @BrandPressedColor +ToggleButton.selectedBackground = @BrandColor +ToggleButton.selectedForeground = #FFF +ToggleButton.disabledSelectedBackground = darken($ToggleButton.background,13%,derived) + +ToggleButton.toolbar.hoverBackground = $Button.toolbar.hoverBackground +ToggleButton.toolbar.pressedBackground = $Button.toolbar.pressedBackground +ToggleButton.toolbar.selectedBackground = $Button.toolbar.selectedBackground + +# button type "tab" +ToggleButton.tab.underlineHeight = 0 +ToggleButton.tab.underlineColor = $TabbedPane.underlineColor +ToggleButton.tab.disabledUnderlineColor = $TabbedPane.disabledUnderlineColor +ToggleButton.tab.selectedBackground = #FFFFFF +ToggleButton.tab.selectedForeground = $?TabbedPane.selectedForeground +ToggleButton.tab.hoverBackground = $fill.click +ToggleButton.tab.focusBackground = #FFFFFF +ToggleButton.tab.arc = $Component.arc + +#button type group +ToggleButton.group.background = #FFF +ToggleButton.group.selectedBackground = #2576EF +ToggleButton.group.selectedForeground = #FFF + +#---- HeadGroup ---- +HeadGroup.background= #E6E9EF +HeadGroup.arc= $Component.arc +#---- HeadMenu ---- +HeadMenu.borderMargins=5,9,5,10 + +#---- ToolBar ---- + +ToolBar.border = com.formdev.flatlaf.ui.FlatToolBarBorder +ToolBar.borderMargins = 2,2,2,2 +ToolBar.isRollover = true +ToolBar.focusableButtons = false +ToolBar.arrowKeysOnlyNavigation = true +ToolBar.hoverButtonGroupArc = 8 +ToolBar.floatable = false +ToolBar.gripColor = @icon +ToolBar.dockingBackground = darken($ToolBar.background,5%) +ToolBar.dockingForeground = $Component.borderColor +ToolBar.floatingBackground = $ToolBar.background +ToolBar.floatingForeground = $Component.borderColor + +ToolBar.separatorSize = null +ToolBar.separatorWidth = 7 +ToolBar.separatorColor = $Separator.foreground + +# not used in FlatLaf; intended for custom components in toolbar +# https://github.com/JFormDesigner/FlatLaf/issues/56#issuecomment-586297814 +ToolBar.spacingBorder = $Button.toolbar.spacingInsets + +ToolBar.hoverButtonGroupBackground = darken($ToolBar.background,3%,derived) + + +#---- ToolTipManager ---- + +ToolTipManager.enableToolTipMode = activeApplication + + +#---- ToolTip ---- + +ToolTip.borderCornerRadius = $Popup.borderCornerRadius +ToolTip.background=$tooltip.normal +ToolTip.foreground=$text.white +ToolTip.border=3,10,3,10 +ToolTip.backgroundInactive=$tooltip.disabled +ToolTip.foregroundInactive=$text.white +ToolTip.arc=$Component.arc +ToolTip.maxWidth=392 + + +#---- Tree ---- + +Tree.border = 1,1,1,1 +Tree.editorBorder = 1,1,1,1,@cellFocusColor +Tree.background = @componentBackground +Tree.selectionInactiveBackground = @selectionBackground +Tree.selectionInactiveForeground = @selectionForeground +Tree.textBackground = $Tree.background +Tree.textForeground = $Tree.foreground +Tree.selectionBorderColor = @cellFocusColor +Tree.dropCellBackground = @dropCellBackground +Tree.dropCellForeground = @dropCellForeground +Tree.dropLineColor = @dropLineColor +Tree.rendererFillBackground = false +Tree.rendererMargins = 4,0,4,0 +Tree.selectionInsets = 0,0,0,0 +Tree.selectionArc = 0 +Tree.wideSelection = true +Tree.repaintWholeRow = true +Tree.paintLines = false +Tree.showCellFocusIndicator = false +Tree.showDefaultIcons = false +Tree.leftChildIndent = 7 +Tree.rightChildIndent = 11 +Tree.rowHeight = 0 +Tree.iconTextGap = 6 + +Tree.expandedIcon = com.formdev.flatlaf.icons.FlatTreeExpandedIcon +Tree.collapsedIcon = com.formdev.flatlaf.icons.FlatTreeCollapsedIcon +Tree.leafIcon = com.formdev.flatlaf.icons.FlatTreeLeafIcon +Tree.closedIcon = com.formdev.flatlaf.icons.FlatTreeClosedIcon +Tree.openIcon = com.formdev.flatlaf.icons.FlatTreeOpenIcon + +Tree.icon.expandedColor = @icon +Tree.icon.collapsedColor = @icon +Tree.icon.leafColor = @icon +Tree.icon.closedColor = @icon +Tree.icon.openColor = @icon +Tree.hash = darken($Tree.background,10%) + +# ---- DottedLine ---- +DottedLine.defaultColor=@BrandColor + + +#---- West ---- +West.border = $defaultBorderColor +#---- ExpandablePane ---- +ExpandablePane.HeaderPane.borderInsets=0, 6, 0, 6 +ExpandablePane.HeaderPane.hGap=0 +ExpandablePane.vGap=5 +HeaderPane.width=248 +HeaderPane.height=$Component.defaultHeight + +#---- East ---- +East.border = $defaultBorderColor +East.TabSelectedColor = @selectionBackground + +#---- South ---- +South.SheetTabRadius = 6 +South.SheetTabButtonGap = 20 +South.SheetIconSepDistance = 16 +South.SheetBarHeight = 24 +South.SheetAddWidth = 6 +South.SheetIconGap = 5 +South.SheetSelectedColor = #FFF + +#---- North ---- +North.userinfoLabel.borderMargins=2, 16, 2, 16 +North.userinfoLabel.width=80 +North.userinfoLabel.height=24 +North.border = $defaultBorderColor +North.messageLabel.foreground=$text.placeholder +North.coverPane.background = #0a1c38 +North.coverPane.radius = 8 +North.hidePane.background = #cdd1d7 + +# ---- Center ---- + +Center.OuterShadowColor = #F2F4F8 +Center.ZoneBorderColor = #E6E9EF +Center.GridColumnRowColor=#e8e8e9 +Center.GridColumnRowSelectedColor=fade(@BrandColor, 12%) +Center.GridColumnRowEditedColor=#e9ecf1 +Center.GridCornerFill=fade(#0A1C38, 47%) +Center.SpaceColor = #FFF +Center.border = 0, 10, 10, 10 +Center.arc=10 + +#---- CellOtherSetPane ---- +CellOtherSetPane.height=$Component.defaultHeight + +Button.breadcrumbForeground = #8F999F +Button.breadcrumbSelectedForeground = #000000 + +chart.normalBorderColor = #DADEE7 +chart.hoverBorderColor = #2576EF +chart.selectedBorderColor = #2576EF + +#---- Styles ------------------------------------------------------------------ + +#---- inTextField ---- +# for leading/trailing components in text fields + +[style]ToggleButton.inTextField = $[style]Button.inTextField + +[style]ToolBar.inTextField = \ + floatable: false; \ + opaque: false; \ + borderMargins: 0,0,0,0 + +[style]ToolBarSeparator.inTextField = \ + separatorWidth: 3 + +[style]Button.inTextField = \ + focusable: false; \ + toolbar.margin: 1,1,1,1; \ + toolbar.spacingInsets: 1,1,1,1; \ + toolbar.hoverBackground: darken($TextField.background,4%); \ + toolbar.pressedBackground: darken($TextField.background,8%); \ + toolbar.selectedBackground: darken($TextField.background,12%) + +[style]Button.primary = \ + background : @BrandColor; \ + foreground : #FFF; \ + focusedBackground : #5493F2; \ + hoverBackground : #5493F2; \ + pressedBackground : #105DD1; \ + disabledSelectedBackground : #F2F4F8; \ + borderWidth : 0 + +[style]Button.abc = margin : 0,8,0,8 + +[style]Button.secondary = \ + background : $Button.background; \ + foreground : $Button.foreground; \ + focusedBackground : $Button.focusedBackground; \ + hoverBackground : darken($Button.default.background,3%,derived); \ + pressedBackground : darken($Button.default.background,10%,derived); \ + borderColor : @accentButtonDefaultBorderColor; \ + hoverBorderColor : $Button.hoverBorderColor; \ + focusedBorderColor : $Button.focusedBorderColor; \ + focusColor : $Component.focusColor; \ + borderWidth : 1 +[style]Button.text=\ + background : fade($Button.background,0%); \ + borderWidth : 0; \ + disabledBackground : fade($Button.background,0%); + +[style]CombinationButton.primary = \ + background : @BrandColor; \ + arc : 3 + +[style]CombinationButton.toolbar = \ + background : #fff + +[style]Button.inToolbarLeft = \ + toolbar.margin : 4,4,4,4 + +[style]Button.inToolbarRight = \ + toolbar.margin : 1,0,1,0 + +[style]Button.tabAction = \ + toolbar.margin : 5,11,5,11 + +[style]ToolBar.topTools = \ + background: #fff + +[style]Panel.normalColor=\ + background: $fill.normal + +[style]Panel.lightGrey=\ + background: $Center.OuterShadowColor + +[style]Panel.menuBar=\ + background: $MenuBar.background + +[style]Label.brandColorLabel=\ + background: $brand.normal;\ + foreground: $text.white;\ + opaque: true + +[style]ToggleButton.inToolbarGroup = \ + margin: 4,4,4,4; + +[style]Menu.menuToolBar=\ + selectionBackground : $brand.normal; \ + selectionForeground : $text.white; \ + acceleratorForeground : @foreground; \ + acceleratorSelectionForeground : $text.white; \ + icon.arrowType : triangle; +[style]MenuItem.menuItemToolBar=\ + selectionBackground : $brand.normal; \ + selectionForeground : $text.white; \ + acceleratorForeground : @foreground; \ + acceleratorSelectionForeground : $text.white +[style]PopupMenu.popupMenuToolBar=\ + background: $fill.gray +[style]TextField.transparentTextField=\ + background: fade(@background, 0%); \ + border: null; +[style]PopupMenu.dropdownPopupMenu=\ + background: fade(@background, 0%); \ + borderInsets: 0,0,0,0; + +[style]Panel.transparentBackground=\ + background: fade(@background, 0%); \ + border: null; + +#---- clearButton ---- +# for clear/cancel button in text fields + +[style]Button.clearButton = \ + icon: com.formdev.flatlaf.icons.FlatClearIcon; \ + focusable: false; \ + toolbar.margin: 1,1,1,1; \ + toolbar.spacingInsets: 1,1,1,1; \ + toolbar.hoverBackground: null; \ + toolbar.pressedBackground: null + +[style]Label.boldLabel = \ + font: bold $defaultFont + +[style]Label.tipLabel = \ + foreground: $Label.tipColor + +[style]Label.warningTipLabel = \ + foreground: $Label.warningColor + +[style]Label.secondaryLabel = \ + foreground: $Label.secondaryColor + +[style]Label.uiListLabel = \ + foreground: $List.wrapper.text.fontColor; \ + background: $background.normal + +[style]Button.plainButton = \ + border: null; \ + background: null; \ + hoverBackground : null; \ + selectedBackground : null; \ + pressedBackground : null + +[style]Button.pastelButton = \ + border: null; \ + background: #2576ef1e + +[style]ToggleButton.compactButton = \ + margin: 2,0,2,0 + +[style]List.pureList = \ + background: $fill.normal + +[style]List.noBorderList = \ + border: 0,0,0,0 + +[style]Tree.pureTree = \ + background: $fill.normal + +[style]ScrollBar.transparentBackground = \ + background: null;\ + track: fade(@background, 0%); \ + hoverTrackColor : fade(@background, 0%) + +[style]Button.breadcrumbButton = \ + background: null;\ + foreground: #8F999F; \ + hoverBackground: #E6E9EF; \ + pressedBackground: #DADEE7; \ + selectedBackground: null + +[style]Table.defaultTable = \ + background: $Table.default.background + +[style]Button.whiteButton = \ + border: com.fine.theme.light.ui.FineRoundBorder; \ + background: $fill.normal + +[style]Button.originalButton = \ + border: 4,4,4,4; \ + background: null; + +[style]Label.detailLabel = \ + foreground: fade(@foreground, 90%); \ + background: $fill.normal; \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties index 1405f81c6a..24cc2ad5aa 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties @@ -3,7 +3,7 @@ com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=630*185 com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=570*31 com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=630*280 com.fr.design.report.ReportColumnsPane=800*600 -com.fr.env.RemoteEnvPane.dialog=458*132 +com.fr.env.RemoteEnvPane.dialog=360*132 com.fr.design.version.check.dialog=490*95 com.fr.design.version.detail.label=750*30 com.fr.design.version.detail.dialog=900*500 @@ -29,3 +29,4 @@ com.fr.design.formula.FormulaPane=900*600 com.fr.design.formula.FormulaPaneWhenReserveFormula=1200*600 com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=130*20 com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=140*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=100*24 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties index 6af9a798c0..d052ead680 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties @@ -28,3 +28,4 @@ com.fr.design.formula.FormulaPane=900*600 com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=100*20 com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=130*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=160*24 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties index 98ac411090..525bfe56ad 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties @@ -28,3 +28,4 @@ com.fr.design.formula.FormulaPane=900*600 com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties index 9c9e1bd92a..3e54c98a84 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties @@ -1,15 +1,15 @@ # \u9ED8\u8BA4\u4E3A\u7C7B\u7684\u5168\u9650\u5B9A\u540D\uFF08\u53EF\u81EA\u5B9A\u4E49key\uFF09= width * height com.fr.design.mainframe.check.CheckButton=250*118 -com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185 +com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=360*185 com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31 -com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280 +com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=360*280 com.fr.env.RemoteEnvPane.dialog=308*132 com.fr.design.version.check.dialog=230*95 com.fr.design.version.detail.label=450*30 com.fr.design.version.detail.dialog=600*500 com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20 com.fr.design.web.pane.text.field=450*20 -com.fr.design.actions.server.dialog=700*630 +com.fr.design.actions.server.dialog=660*600 com.fr.design.report.fit.templatePane.dialog=600*400 com.fr.design.report.fit.firstColumn=80*20 com.fr.design.report.fit.column=100*20 @@ -22,9 +22,10 @@ com.fr.design.ds.column.sort.pane=220*150 com.fr.design.sort.expand.header.pane=108*10 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.report.WatermarkSettingPane=660*600 com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 com.fr.design.formula.FormulaPane=900*600 com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties index 03972b51c0..e1bcdba473 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties @@ -27,3 +27,4 @@ com.fr.design.formula.FormulaPane=900*600 com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 diff --git a/designer-base/src/main/resources/com/fr/design/images/data/hyperlink.png b/designer-base/src/main/resources/com/fr/design/images/data/hyperlink.png new file mode 100644 index 0000000000..0fae16edfd Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/data/hyperlink.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/data/hyperlink.svg b/designer-base/src/main/resources/com/fr/design/images/data/hyperlink.svg new file mode 100644 index 0000000000..f887030d68 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/data/hyperlink.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/images/data/user_widget.png b/designer-base/src/main/resources/com/fr/design/images/data/user_widget.png index 0457f5617e..922e5a160d 100644 Binary files a/designer-base/src/main/resources/com/fr/design/images/data/user_widget.png and b/designer-base/src/main/resources/com/fr/design/images/data/user_widget.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/data/user_widget.svg b/designer-base/src/main/resources/com/fr/design/images/data/user_widget.svg new file mode 100644 index 0000000000..af4281adf2 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/data/user_widget.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg b/designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg deleted file mode 100644 index 6ddc105cb9..0000000000 --- a/designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - 高级编辑 - - - - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold.svg new file mode 100644 index 0000000000..4aa1b6c071 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic.svg new file mode 100644 index 0000000000..3d53d5ffe8 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_bold.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_bold.png new file mode 100644 index 0000000000..51138933a7 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_bold.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_italic.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_italic.png new file mode 100644 index 0000000000..00d3176fb7 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_italic.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_underline.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_underline.png new file mode 100644 index 0000000000..4a794e122f Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/new_underline.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline.svg b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline.svg new file mode 100644 index 0000000000..326f2fa6e0 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked.svg new file mode 100644 index 0000000000..fa4b47ddd7 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked_disable.svg new file mode 100644 index 0000000000..88df5c1a59 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/hovered.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/hovered.svg new file mode 100644 index 0000000000..54a7539d4d --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/hovered.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/part_checked.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/part_checked.svg new file mode 100644 index 0000000000..caeebfd58c --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/part_checked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked.svg new file mode 100644 index 0000000000..86fa2f7148 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked_disable.svg new file mode 100644 index 0000000000..cab88105ee --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java index dd7617d95c..07d6c9aab9 100644 --- a/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java +++ b/designer-base/src/test/java/com/fr/design/EnvChangeEntranceTest.java @@ -39,7 +39,7 @@ public class EnvChangeEntranceTest { @Test public void showServiceDialog() throws Exception { try { - EnvChangeEntrance entrance = EnvChangeEntrance.getInstance(); + /* EnvChangeEntrance entrance = EnvChangeEntrance.getInstance(); DesignerWorkspaceInfo selectedEnv = EasyMock.mock(DesignerWorkspaceInfo.class); WorkspaceConnectionInfo connectionInfo = EasyMock.mock(WorkspaceConnectionInfo.class); @@ -58,7 +58,7 @@ public class EnvChangeEntranceTest { PowerMock.expectNew(CheckServiceDialog.class, EasyMock.anyObject(Frame.class), EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyString()).andReturn(dialog); EasyMock.replay(request, selectedEnv, connectionInfo); - PowerMock.replayAll(); + PowerMock.replayAll();*/ //entrance.showServiceDialog(selectedEnv); diff --git a/designer-base/src/test/java/com/fr/design/file/MultiTemplateTabPaneTest.java b/designer-base/src/test/java/com/fr/design/file/MultiTemplateTabPaneTest.java index c00976abb3..bae2b8ebdf 100644 --- a/designer-base/src/test/java/com/fr/design/file/MultiTemplateTabPaneTest.java +++ b/designer-base/src/test/java/com/fr/design/file/MultiTemplateTabPaneTest.java @@ -14,13 +14,10 @@ import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; import com.fr.plugin.injectable.PluginModule; import junit.framework.TestCase; -import org.junit.Assert; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JPanel; -import java.util.ArrayList; -import java.util.List; public class MultiTemplateTabPaneTest extends TestCase { @Override @@ -28,61 +25,61 @@ public class MultiTemplateTabPaneTest extends TestCase { PluginModule.registerAgent(PluginModule.ExtraDesign, new ExtraDesignClassManager()); } - /** - * 当前显示模式A，传入index左边(含当前)或右边有模式A的模板，返回最近的模式A模板index（优先左边） - */ - public void test_index_left_has_same_mode_temp() { - //当前显示模式A，传入index左边(含当前)有模式A的模板，返回左边最近的模式A模板index - List> openedTemplateList = new ArrayList<>(); - openedTemplateList.add(new A_Mode()); - Assert.assertEquals(0, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); - openedTemplateList.add(new A_Mode()); - Assert.assertEquals(1, MultiTemplateTabUtils.calShowTemplateIndex(1, openedTemplateList, "A_Mode")); - openedTemplateList.add(new B_Mode()); - Assert.assertEquals(1, MultiTemplateTabUtils.calShowTemplateIndex(1, openedTemplateList, "A_Mode")); - } - - public void test_index_left_has_not_but_right_has_same_mode_temp() { - //当前显示模式A，传入index左边没有但是右边有模式A的模板，返回右边最近的模式A模板index - List> openedTemplateList = new ArrayList<>(); - openedTemplateList.add(new B_Mode()); - openedTemplateList.add(new A_Mode()); - Assert.assertEquals(1, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); - openedTemplateList.add(1, new B_Mode()); - openedTemplateList.add(new A_Mode()); - Assert.assertEquals(2, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); - openedTemplateList.add(new A_Mode()); - Assert.assertEquals(2, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); - } - - /** - * 当前显示模式A，没有模式A的模板，左边(含当前)或者右边有其他模式的模板，返回最近的其他模式模式模板index（优先左边） - */ - public void test_no_same_mode_temp_but_index_left_has_other_mode_temp() { - //当前显示模式A，没有模式A的模板，左边(含当前)有其他模式模板，返回左边最近的其他模式模板index - List> openedTemplateList = new ArrayList<>(); - openedTemplateList.add(new B_Mode()); - Assert.assertEquals(0, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); - openedTemplateList.add(new B_Mode()); - Assert.assertEquals(1, MultiTemplateTabUtils.calShowTemplateIndex(1, openedTemplateList, "A_Mode")); - } - - - public void test_has_no_temp() { - //当前显示模式A，没有模式A的模板，也没有其他模式的模板，返回-1 - List> openedTemplateList = new ArrayList<>(); - Assert.assertEquals(-1, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); - } - - - public void test_if_index_less_than_zero_or_more_than_open_temp_size() { - //index<0 或者超出openTemplateList.size时，返回-1 - List> openedTemplateList = new ArrayList<>(); - Assert.assertEquals(-1, MultiTemplateTabUtils.calShowTemplateIndex(-1, openedTemplateList, "A_Mode")); - Assert.assertEquals(-1, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); - openedTemplateList.add(new A_Mode()); - Assert.assertEquals(-1, MultiTemplateTabUtils.calShowTemplateIndex(1, openedTemplateList, "A_Mode")); - } +// /** +// * 当前显示模式A，传入index左边(含当前)或右边有模式A的模板，返回最近的模式A模板index（优先左边） +// */ +// public void test_index_left_has_same_mode_temp() { +// //当前显示模式A，传入index左边(含当前)有模式A的模板，返回左边最近的模式A模板index +// List> openedTemplateList = new ArrayList<>(); +// openedTemplateList.add(new A_Mode()); +// Assert.assertEquals(0, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); +// openedTemplateList.add(new A_Mode()); +// Assert.assertEquals(1, MultiTemplateTabUtils.calShowTemplateIndex(1, openedTemplateList, "A_Mode")); +// openedTemplateList.add(new B_Mode()); +// Assert.assertEquals(1, MultiTemplateTabUtils.calShowTemplateIndex(1, openedTemplateList, "A_Mode")); +// } +// +// public void test_index_left_has_not_but_right_has_same_mode_temp() { +// //当前显示模式A，传入index左边没有但是右边有模式A的模板，返回右边最近的模式A模板index +// List> openedTemplateList = new ArrayList<>(); +// openedTemplateList.add(new B_Mode()); +// openedTemplateList.add(new A_Mode()); +// Assert.assertEquals(1, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); +// openedTemplateList.add(1, new B_Mode()); +// openedTemplateList.add(new A_Mode()); +// Assert.assertEquals(2, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); +// openedTemplateList.add(new A_Mode()); +// Assert.assertEquals(2, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); +// } +// +// /** +// * 当前显示模式A，没有模式A的模板，左边(含当前)或者右边有其他模式的模板，返回最近的其他模式模式模板index（优先左边） +// */ +// public void test_no_same_mode_temp_but_index_left_has_other_mode_temp() { +// //当前显示模式A，没有模式A的模板，左边(含当前)有其他模式模板，返回左边最近的其他模式模板index +// List> openedTemplateList = new ArrayList<>(); +// openedTemplateList.add(new B_Mode()); +// Assert.assertEquals(0, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); +// openedTemplateList.add(new B_Mode()); +// Assert.assertEquals(1, MultiTemplateTabUtils.calShowTemplateIndex(1, openedTemplateList, "A_Mode")); +// } + + +// public void test_has_no_temp() { +// //当前显示模式A，没有模式A的模板，也没有其他模式的模板，返回-1 +// List> openedTemplateList = new ArrayList<>(); +// Assert.assertEquals(-1, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); +// } +// +// +// public void test_if_index_less_than_zero_or_more_than_open_temp_size() { +// //index<0 或者超出openTemplateList.size时，返回-1 +// List> openedTemplateList = new ArrayList<>(); +// Assert.assertEquals(-1, MultiTemplateTabUtils.calShowTemplateIndex(-1, openedTemplateList, "A_Mode")); +// Assert.assertEquals(-1, MultiTemplateTabUtils.calShowTemplateIndex(0, openedTemplateList, "A_Mode")); +// openedTemplateList.add(new A_Mode()); +// Assert.assertEquals(-1, MultiTemplateTabUtils.calShowTemplateIndex(1, openedTemplateList, "A_Mode")); +// } private class A_Mode extends AbstractTestMode { public String getTemplateTabOperatorType() { diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/DebugStory.java b/designer-base/src/test/java/com/fr/design/gui/storybook/DebugStory.java new file mode 100644 index 0000000000..ef000aabe5 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/DebugStory.java @@ -0,0 +1,21 @@ +package com.fr.design.gui.storybook; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 单面板调试注解，如果components目录下带有这个注解， + * 那么Storybook中只有带有这个注解的界面被展示 + * + * @author vito + * @since 11.0 + * Created on 2024/6/11 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +@Inherited +public @interface DebugStory { +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/Story.java b/designer-base/src/test/java/com/fr/design/gui/storybook/Story.java new file mode 100644 index 0000000000..5e18f2bd9c --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/Story.java @@ -0,0 +1,19 @@ +package com.fr.design.gui.storybook; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author vito + * @since 11.0 + * Created on 2023/12/15 + */ + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +@Inherited +public @interface Story { +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/StoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/StoryBoard.java new file mode 100644 index 0000000000..5e443bf349 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/StoryBoard.java @@ -0,0 +1,43 @@ +package com.fr.design.gui.storybook; + +import com.fine.swing.ui.layout.Column; +import com.fr.design.gui.ilable.UILabel; + +import javax.swing.JComponent; + +import static com.fine.swing.ui.layout.Layouts.cell; + +/** + * UI 故事板，用于demo + * 展示每个UI组件的能力 + * + * @author vito + * @since 11.0 + * Created on 2023/11/27 + */ +public class StoryBoard extends Column { + + protected String title; + + public StoryBoard(String title) { + this.title = title; + setSpacing(4); + add(cell(new UILabel(title)).with(this::h2)); + } + + protected void h1(JComponent component) { + styleClass(component,"h1"); + } + + protected void h2(JComponent component) { + styleClass(component,"h2"); + } + + protected void h3(JComponent component) { + styleClass(component,"h3"); + } + + private void styleClass(JComponent component, String key) { + component.putClientProperty("FlatLaf.styleClass", key); + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/StoryBookComponent.java b/designer-base/src/test/java/com/fr/design/gui/storybook/StoryBookComponent.java new file mode 100644 index 0000000000..da0a797db9 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/StoryBookComponent.java @@ -0,0 +1,24 @@ +package com.fr.design.gui.storybook; + +import javax.swing.JComponent; + +/** + * @author vito + * @since 11.0 + * Created on 2023/11/27 + */ +public class StoryBookComponent { + public String name; + public String className; + public Class component; + + public StoryBookComponent(String name, Class component) { + this.name = name; + this.component = component; + } + + public StoryBookComponent(String name, String className) { + this.name = name; + this.className = className; + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/Storybook.java b/designer-base/src/test/java/com/fr/design/gui/storybook/Storybook.java new file mode 100644 index 0000000000..d8b09ca523 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/Storybook.java @@ -0,0 +1,265 @@ +package com.fr.design.gui.storybook; + +import com.fanruan.gui.UiInspector; +import com.fine.theme.light.ui.laf.FineDarkLaf; +import com.fine.theme.light.ui.laf.FineLightLaf; +import com.finebi.cbb.utils.StringUtils; +import com.formdev.flatlaf.FlatLaf; +import com.formdev.flatlaf.extras.FlatAnimatedLafChange; +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.formdev.flatlaf.util.UIScale; +import com.fr.design.gui.UILookAndFeel; +import com.fr.third.org.reflections.Reflections; +import com.fr.value.NotNullLazyValue; + +import javax.swing.DefaultListCellRenderer; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JList; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.KeyStroke; +import javax.swing.LookAndFeel; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineUIScale.scale; + +/** + * UI 故事书，用于demo + * 展示每个UI组件的能力 + * + * @author vito + * @since 11.0 + * Created on 2023/11/27 + */ +public class Storybook { + public static final String COMPONENTS_DIR = "/com/fr/design/gui/storybook/components"; + public static final String COMPONENTS_PACKAGE = COMPONENTS_DIR.substring(1) + .replaceAll("/", ".") + "."; + + private final NotNullLazyValue StoryBookComponent = NotNullLazyValue.createValue(this::components); + + private JPanel cards; + private JFrame jf; + + public void start() { + FineLightLaf.setup(); + jf = new JFrame("Story Book(dpi scale:" + UIScale.getUserScaleFactor() * 100 + "%)"); + jf.setJMenuBar(initMenu()); + jf.add(row( + cell(new JList<>(StoryBookComponent.getValue())).with(it -> { + it.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); + it.setCellRenderer(new MyListCellRenderer()); + it.addListSelectionListener(e -> { + cards.removeAll(); + cards.add(newPanel(StoryBookComponent.getValue()[it.getSelectedIndex()])); + cards.revalidate(); + }); + }), + cell(new JScrollPane()).weight(1).with(it -> { + cards = new JPanel(new BorderLayout()); + it.setViewportView(cards); + cards.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); + cards.add(newPanel(StoryBookComponent.getValue()[0])); + }) + ).getComponent()); + jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + jf.setSize(scale(600), scale(400)); + new UiInspector(); + jf.setVisible(true); + } + + private JComponent newPanel(StoryBookComponent storyBookComponent) { + try { + if (StringUtils.isNotBlank(storyBookComponent.className)) { + return (JComponent) Class.forName(storyBookComponent.className).newInstance(); + } else { + return storyBookComponent.component.newInstance(); + } + } catch (InstantiationException | IllegalAccessException | ClassNotFoundException ex) { + throw new RuntimeException(ex); + } + } + + static class MyListCellRenderer extends DefaultListCellRenderer { + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + setText(((StoryBookComponent) value).name); + return this; + } + } + + private StoryBookComponent[] components() { + ArrayList components = new ArrayList<>(); + List> componentList = getDebugClasses(); + if (componentList.isEmpty()) { + componentList = getClasses(); + } + for (Class s : componentList) { + components.add( + new StoryBookComponent(s.getSimpleName().replace("StoryBoard", ""), s.getTypeName())); + } + + return components.toArray(new StoryBookComponent[0]); + } + + private static List> getClasses() { + Reflections reflections = new Reflections("com.fr.design.gui.storybook.components"); + Set> storyClass = reflections.getTypesAnnotatedWith(Story.class); + Set> classSet = reflections.getSubTypesOf(StoryBoard.class); + storyClass.addAll(classSet); + return storyClass.stream().sorted(Comparator.comparing(Class::getSimpleName)).collect(Collectors.toList()); + } + + private static List> getDebugClasses() { + Reflections reflections = new Reflections("com.fr.design.gui.storybook.components"); + Set> types = reflections.getTypesAnnotatedWith(DebugStory.class); + return new ArrayList<>(types); + } + + /** + * 标记Story注解或者继承自StoryBoard的将展示到Storybook + */ + private static boolean isStory(String className) { + try { + Class aClass = Class.forName(COMPONENTS_PACKAGE + className); + return aClass.isAnnotationPresent(Story.class) + || StoryBoard.class.isAssignableFrom(aClass) + || isStoryboardByName(aClass); + } catch (ClassNotFoundException e) { + return false; + } + } + + private static boolean isStoryboardByName(Class aClass) { + return aClass.getName().toLowerCase().contains("storyboard") + && !aClass.isMemberClass() + && !aClass.isAnonymousClass(); + } + + /** + * 应用主题 + */ + private void applyLookAndFeel(LookAndFeel lookAndFeel) { + FlatAnimatedLafChange.showSnapshot(); + try { + UIManager.setLookAndFeel(lookAndFeel); + } catch (UnsupportedLookAndFeelException e) { + throw new RuntimeException(e); + } + FlatLaf.updateUI(); + FlatAnimatedLafChange.hideSnapshotWithAnimation(); + } + + /** + * 应用DPI + */ + private void applyDPI(float dpi) { + System.setProperty("flatlaf.uiScale", String.valueOf(dpi)); + FlatAnimatedLafChange.showSnapshot(); + LookAndFeel lookAndFeel = UIManager.getLookAndFeel(); + if (lookAndFeel instanceof FineLightLaf) { + FineLightLaf.setup(); + } else if (lookAndFeel instanceof FineDarkLaf) { + FineDarkLaf.setup(); + } else { + try { + UIManager.setLookAndFeel(lookAndFeel); + } catch (UnsupportedLookAndFeelException e) { + throw new RuntimeException(e); + } + } + FlatLaf.updateUI(); + FlatAnimatedLafChange.hideSnapshotWithAnimation(); + jf.setSize(scale(600), scale(400)); + } + + /** + * 添加外观和缩放 + * + * @return 菜单 + */ + private JMenuBar initMenu() { + JMenuBar menuBar = new JMenuBar(); + + JMenu menu = new JMenu("外观"); + menu.setMnemonic(KeyEvent.VK_A); + menuBar.add(menu); + + FineLightLaf fineLightLaf = new FineLightLaf(); + JMenuItem menuItem = new JMenuItem(fineLightLaf.getName(), + KeyEvent.VK_T); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + KeyEvent.VK_1, ActionEvent.ALT_MASK)); + menuItem.addActionListener(e -> applyLookAndFeel(fineLightLaf)); + menu.add(menuItem); + + FineDarkLaf darkLaf = new FineDarkLaf(); + menuItem = new JMenuItem(darkLaf.getName(), + KeyEvent.VK_T); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + KeyEvent.VK_2, ActionEvent.ALT_MASK)); + menuItem.addActionListener(e -> applyLookAndFeel(darkLaf)); + menu.add(menuItem); + + menuItem = new JMenuItem("FR11", + KeyEvent.VK_T); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + KeyEvent.VK_3, ActionEvent.ALT_MASK)); + menuItem.addActionListener(e -> applyLookAndFeel(new UILookAndFeel())); + menu.add(menuItem); + + menu = new JMenu("缩放"); + menu.setMnemonic(KeyEvent.VK_A); + menuBar.add(menu); + + menuItem = new JMenuItem("100%（96dpi)", + KeyEvent.VK_Y); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + KeyEvent.VK_1, ActionEvent.META_MASK)); + menuItem.addActionListener(e -> applyDPI(1.0f)); + + menu.add(menuItem); + menuItem = new JMenuItem("150%（144dpi)", + KeyEvent.VK_Y); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + KeyEvent.VK_2, ActionEvent.META_MASK)); + menuItem.addActionListener(e -> applyDPI(1.5f)); + menu.add(menuItem); + + menu.add(menuItem); + menuItem = new JMenuItem("200%（192dpi)", + KeyEvent.VK_Y); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + KeyEvent.VK_3, ActionEvent.META_MASK)); + menuItem.addActionListener(e -> applyDPI(2.0f)); + menu.add(menuItem); + + + return menuBar; + + } + + + public static void main(String... args) { + SwingUtilities.invokeLater(() -> new Storybook().start()); + } + +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/ButtonGroupStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ButtonGroupStoryBoard.java new file mode 100644 index 0000000000..2b259dbe84 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ButtonGroupStoryBoard.java @@ -0,0 +1,102 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.theme.icon.LazyIcon; +import com.fr.design.gui.ibutton.UIButtonGroup; +import com.fr.design.gui.ibutton.UITabGroup; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itoolbar.UIToolbar; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.stable.ArrayUtils; +import com.fr.value.NotNullLazyValue; + +import javax.swing.Icon; +import java.awt.Component; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; + +/** + * Tab按钮组 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/14 + */ +@Story +public class ButtonGroupStoryBoard extends StoryBoard { + public ButtonGroupStoryBoard() { + super("切换按钮组"); + add( + cell(new UILabel("单行文字按钮")).with(this::h3), + cell(new UIButtonGroup<>(new String[]{"按钮1", "按钮2", "按钮3"})), + cell(new UILabel("单行图标按钮")).with(this::h3), + cell(new UIButtonGroup<>(iconArray())), + cell(new UILabel("选中切换图标按钮")).with(this::h3), + cell(new UIButtonGroup<>(iconArrayWithWhite())), + cell(new UILabel("多行按钮-偶数场景-6按钮")).with(this::h3), + cell(new UITabGroup(sixTextArray())), + cell(new UILabel("多行按钮-全部禁用")).with((this::h3)), + cell(getAllDisabledGroup()), + cell(new UILabel("多行按钮-部分禁用")).with((this::h3)), + cell(getPartDisabledGroup(0)), + cell(new UILabel("多行按钮-奇数场景-5按钮")).with((this::h3)), + cell(new UITabGroup(fiveTextArray())), + cell(new UILabel("多行按钮-奇数场景-7按钮")).with(this::h3), + cell(new UITabGroup(sevenTextArray())), + cell(new UILabel("单行按钮-工具栏")).with(this::h3), + cell(getToolbar()), + flex() + ); + } + + private static final NotNullLazyValue iconArray = NotNullLazyValue.createValue(() -> ArrayUtils.toArray( + new LazyIcon("edit"), + new LazyIcon("preview"), + new LazyIcon("connection") + )); + + private static final NotNullLazyValue iconArrayWithWhite = NotNullLazyValue.createValue(() -> ArrayUtils.toArray( + ArrayUtils.toArray(new LazyIcon("edit"), new LazyIcon("copy")), + ArrayUtils.toArray(new LazyIcon("preview"), new LazyIcon("save")) + )); + + private static Component getToolbar() { + UIToolbar toolbar = new UIToolbar(); + UIButtonGroup objectUIButtonGroup = new UIButtonGroup<>(iconArrayWithWhite(), null, true); + toolbar.add(objectUIButtonGroup); + return toolbar; + } + + private static Icon[] iconArray() { + return iconArray.getValue(); + } + + private static Icon[][] iconArrayWithWhite() { + return iconArrayWithWhite.getValue(); + } + + private String[] fiveTextArray() { + return ArrayUtils.toArray("按钮1", "按钮2", "按钮3", "按钮4", "按钮5"); + } + + private String[] sevenTextArray() { + return ArrayUtils.toArray("按钮1", "按钮2", "按钮3", "按钮4", "按钮5", "按钮6", "按钮7"); + } + + private String[] sixTextArray() { + return ArrayUtils.toArray("按钮1", "按钮2", "按钮3", "按钮4", "按钮5", "按钮6"); + } + + private UITabGroup getAllDisabledGroup() { + UITabGroup group = new UITabGroup(sixTextArray()); + group.setEnabled(false); + return group; + } + + private UITabGroup getPartDisabledGroup(int index) { + UITabGroup group = new UITabGroup(sixTextArray()); + group.getButton(index).setEnabled(false); + return group; + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/ButtonStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ButtonStoryBoard.java new file mode 100644 index 0000000000..54181cf0d6 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ButtonStoryBoard.java @@ -0,0 +1,199 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.theme.icon.LazyIcon; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ibutton.UICombinationButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.design.style.color.UIToolbarColorButton; + +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JToolBar; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.theme.utils.FineUIStyle.STYLE_PRIMARY; +import static com.fine.theme.utils.FineUIStyle.STYLE_SIZE_SMALL; +import static com.fine.theme.utils.FineUIStyle.STYLE_TEXT; +import static com.fine.theme.utils.FineUIStyle.joinStyle; +import static com.fine.theme.utils.FineUIStyle.setStyle; + +/** + * 按钮 + * + * @author vito + * @since 11.0 + * Created on 2023/11/27 + */ +@Story +public class ButtonStoryBoard extends StoryBoard { + + public ButtonStoryBoard() { + super("按钮"); + setSpacing(16); + add( + row(30, true, + column(16, + cell(new UILabel(STYLE_PRIMARY)).with(this::h2), + cell(new UILabel("medium")).with(this::h3), + row(20, + cell(new UILabel("正常")), + cell(new UIButton("按钮")) + .with(it -> setStyle(it, STYLE_PRIMARY)), + cell(new UIButton("按钮", new LazyIcon("add").white())) + .with(it -> setStyle(it, STYLE_PRIMARY)), + cell(new UIButton(new LazyIcon("multi"))) + .with(it -> setStyle(it, STYLE_PRIMARY)) + ), + row(20, + cell(new UILabel("禁用")), + cell(new UIButton("按钮")).with(it -> { + setStyle(it, STYLE_PRIMARY); + it.setEnabled(false); + }), + cell(new UIButton("保存", new LazyIcon("save").white())).with(it -> { + setStyle(it, STYLE_PRIMARY); + it.setEnabled(false); + }), + cell(new UIButton(new LazyIcon("add"))).with(it -> { + setStyle(it, STYLE_PRIMARY); + it.setEnabled(false); + }) + ), + cell(new UILabel("small")).with(this::h3), + row(20, + cell(new UILabel("正常")), + cell(new UIButton("按钮")) + .with(it -> setStyle(it, joinStyle(STYLE_PRIMARY, STYLE_SIZE_SMALL))), + cell(new UIButton("按钮", new LazyIcon("add").white())) + .with(it -> setStyle(it, joinStyle(STYLE_PRIMARY, STYLE_SIZE_SMALL))), + cell(new UIButton(new LazyIcon("multi"))) + .with(it -> setStyle(it, joinStyle(STYLE_PRIMARY, STYLE_SIZE_SMALL))) + ), + row(20, + cell(new UILabel("禁用")), + cell(new UIButton("按钮")).with(it -> { + setStyle(it, joinStyle(STYLE_PRIMARY, STYLE_SIZE_SMALL)); + it.setEnabled(false); + }), + cell(new UIButton("保存", new LazyIcon("save"))).with(it -> { + setStyle(it, joinStyle(STYLE_PRIMARY, STYLE_SIZE_SMALL)); + it.setEnabled(false); + }), + cell(new UIButton(new LazyIcon("add"))).with(it -> { + setStyle(it, joinStyle(STYLE_PRIMARY, STYLE_SIZE_SMALL)); + it.setEnabled(false); + }) + ) + ), + column(16, + cell(new UILabel("Secondary")).with(this::h2), + cell(new UILabel("medium")).with(this::h3), + row(20, + cell(new UILabel("正常")).with(it -> setStyle(it, "secondary")), + cell(new UIButton("按钮")), + cell(new UIButton("按钮", new LazyIcon("add"))), + cell(new UIButton(new LazyIcon("multi"))) + ), + row(20, + cell(new UILabel("禁用")), + cell(new UIButton("按钮")).with(it -> it.setEnabled(false)), + cell(new UIButton("保存", new LazyIcon("save"))).with(it -> it.setEnabled(false)), + cell(new UIButton(new LazyIcon("add"))).with(it -> it.setEnabled(false)) + ), + cell(new UILabel("small")).with(this::h3), + row(20, + cell(new UILabel("正常")), + cell(new UIButton("按钮")) + .with(it -> setStyle(it, STYLE_SIZE_SMALL)), + cell(new UIButton("按钮", new LazyIcon("add"))) + .with(it -> setStyle(it, STYLE_SIZE_SMALL)), + cell(new UIButton(new LazyIcon("multi"))) + .with(it -> setStyle(it, STYLE_SIZE_SMALL)) + ), + row(20, + cell(new UILabel("禁用")), + cell(new UIButton("按钮")).with(it -> { + setStyle(it, STYLE_SIZE_SMALL); + it.setEnabled(false); + }), + cell(new UIButton("保存", new LazyIcon("save"))).with(it -> { + setStyle(it, STYLE_SIZE_SMALL); + it.setEnabled(false); + }), + cell(new UIButton(new LazyIcon("add"))).with(it -> { + setStyle(it, STYLE_SIZE_SMALL); + it.setEnabled(false); + }) + ) + ) + ), + column(16, + cell(new UILabel(STYLE_TEXT)).with(this::h2), + row(20, + cell(new UILabel("正常")), + cell(new UIButton("按钮")) + .with(it -> setStyle(it, STYLE_TEXT)), + cell(new UIButton("按钮", new LazyIcon("add"))) + .with(it -> setStyle(it, STYLE_TEXT)), + cell(new UIButton(new LazyIcon("multi"))) + .with(it -> setStyle(it, STYLE_TEXT)) + ), + row(20, + cell(new UILabel("禁用")), + cell(new UIButton("按钮")).with(it -> { + setStyle(it, STYLE_TEXT); + it.setEnabled(false); + }), + cell(new UIButton("保存", new LazyIcon("save").disabled())).with(it -> { + setStyle(it, STYLE_TEXT); + it.setEnabled(false); + }), + cell(new UIButton(new LazyIcon("add").disabled())).with(it -> { + setStyle(it, STYLE_TEXT); + it.setEnabled(false); + }) + ) + ), + cell(new UILabel("JButton")).with(this::h2), + row(20, + cell(new UILabel("medium")), + cell(new JButton("按钮")), + cell(new JButton("按钮", new LazyIcon("add"))), + cell(new JButton(new LazyIcon("multi"))) + ), + row(20, + cell(new UILabel("medium")), + cell(new JButton("按钮")).with(it -> it.setEnabled(false)), + cell(new JButton("保存", new LazyIcon("save"))).with(it -> it.setEnabled(false)), + cell(new JButton(new LazyIcon("add"))).with(it -> it.setEnabled(false)) + ), + row(20, + cell(new UICombinationButton("按钮", new LazyIcon("triangle_down").white())) + .with(it -> setStyle(it, STYLE_PRIMARY)), + cell(new UICombinationButton("按钮2", new LazyIcon("triangle_down"))), + cell(new JButton("按钮", new LazyIcon("add"))), + cell(new JButton(new LazyIcon("multi"))) + ), + row(20, + cell(new UIToolbarColorButton(new LazyIcon("foreground"))), + cell(toolbar()) + .with(it -> { + }) + ), + flex() + ); + } + + public JComponent toolbar(){ + JToolBar bar = new JToolBar(); + UIToolbarColorButton foreground = new UIToolbarColorButton(new LazyIcon("foreground")); + bar.add(foreground); + setStyle(bar, "topTools"); + return bar; + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/CheckBoxStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/CheckBoxStoryBoard.java new file mode 100644 index 0000000000..6ce047d0e7 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/CheckBoxStoryBoard.java @@ -0,0 +1,107 @@ +package com.fr.design.gui.storybook.components; + + +import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itree.checkboxtree.NullTristateCheckBox; +import com.fr.design.gui.itree.checkboxtree.TristateCheckBox; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; + +import javax.swing.AbstractButton; +import javax.swing.JPanel; +import java.awt.Component; +import java.awt.event.ItemListener; +import java.util.Arrays; +import java.util.List; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + +/** + * 复选按钮 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/14 + */ +@Story +public class CheckBoxStoryBoard extends StoryBoard { + + public CheckBoxStoryBoard() { + super("复选按钮"); + add( + cell(new UILabel("水平布局")).with(this::h3), + row(10, + cell(new UICheckBox("测试1")), + cell(new UICheckBox("测试2")), + cell(new UICheckBox("测试3")) + ), + fix(5), + cell(new UILabel("垂直布局")).with(this::h3), + column(5, + cell(new UICheckBox("测试1")), + cell(new UICheckBox("测试2")), + cell(new UICheckBox("测试3")) + ), + fix(5), + cell(new UILabel("禁用状态")).with(this::h3), + row(10, + cell(getDisabledStatus(new UICheckBox("测试"))), + cell(getDisabledSelectedStatus(new UICheckBox("测试"))) + ), + cell(new UILabel("三态选择框")).with(this::h3), + row(10, + cell(initTristateCheckboxGroup()) + ), + flex() + ); + } + + private JPanel initTristateCheckboxGroup() { + TristateCheckBox parent = new NullTristateCheckBox("父选框", TristateCheckBox.NOT_SELECTED); + UICheckBox checkBoxA = new UICheckBox("子选框1"); + UICheckBox checkBoxB = new UICheckBox("子选框1"); + UICheckBox checkBoxC = new UICheckBox("子选框1"); + List childBoxes = Arrays.asList(checkBoxA, checkBoxB, checkBoxC); + ItemListener sonListener = e -> { + int selectedCount = (int) childBoxes.stream().filter(AbstractButton::isSelected).count(); + if (selectedCount == 0) { + parent.setState(TristateCheckBox.NOT_SELECTED); + } else if (selectedCount == childBoxes.size()) { + parent.setState(TristateCheckBox.SELECTED); + } else { + parent.setState(TristateCheckBox.DO_NOT_CARE); + } + }; + childBoxes.forEach(it -> it.addItemListener(sonListener)); + parent.addStateChangeListener(() -> { + childBoxes.forEach(it -> it.removeItemListener(sonListener)); + if (parent.getState() == TristateCheckBox.SELECTED) { + childBoxes.forEach(it -> it.setSelected(true)); + } else if (parent.getState() == TristateCheckBox.NOT_SELECTED) { + childBoxes.forEach(it -> it.setSelected(false)); + } + childBoxes.forEach(it -> it.addItemListener(sonListener)); + }); + + return row(10, + cell(parent), cell(checkBoxA), cell(checkBoxB), cell(checkBoxC) + ).getComponent(); + } + + private Component getDisabledStatus(UICheckBox c) { + c.setEnabled(false); + return c; + } + + private Component getDisabledSelectedStatus(UICheckBox c) { + c.setSelected(true); + c.setEnabled(false); + return c; + } + +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/ComboBoxStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ComboBoxStoryBoard.java new file mode 100644 index 0000000000..23019f64c1 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ComboBoxStoryBoard.java @@ -0,0 +1,51 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.gui.icombobox.LineComboBox; +import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.stable.ArrayUtils; +import com.fr.stable.CoreConstants; + +import java.awt.*; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; + +/** + * 下拉选择框 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/14 + */ +@Story +public class ComboBoxStoryBoard extends StoryBoard { + + public ComboBoxStoryBoard() { + super("下拉选择框"); + + add( + cell(new UILabel("普通状态")).with(this::h3), + cell(new UIComboBox( + ArrayUtils.toArray("测试1", "测试2", "测试3", "测试4") + )), + cell(new UILabel("禁用状态")).with(this::h3), + cell(getDisabledStatus()), + + cell(new UILabel("线型下拉框")).with(this::h3), + cell(new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY)), + flex() + ); + } + + private Component getDisabledStatus() { + UIComboBox box = new UIComboBox( + ArrayUtils.toArray("测试1", "测试2", "测试3", "测试4") + ); + box.setEnabled(false); + return box; + } + +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/EastRegionContainer.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/EastRegionContainer.java new file mode 100644 index 0000000000..267df28e0d --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/EastRegionContainer.java @@ -0,0 +1,19 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.design.mainframe.EastRegionContainerPane; + +/** + * 东区 + * + * @author vito + * @since 11.0 + * Created on 2023/11/28 + */ +public class EastRegionContainer extends StoryBoard { + + public EastRegionContainer() { + super("东区工具栏"); + add(EastRegionContainerPane.getInstance()); + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/ExpandablePaneStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ExpandablePaneStoryBoard.java new file mode 100644 index 0000000000..cd3c3e3ae1 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ExpandablePaneStoryBoard.java @@ -0,0 +1,47 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.foldablepane.UIExpandablePane; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.StoryBoard; + +import javax.swing.JPanel; +import java.awt.BorderLayout; + +import static com.fine.swing.ui.layout.Layouts.*; + +/** + * 扩展面板 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/14 + */ +public class ExpandablePaneStoryBoard extends StoryBoard { + public ExpandablePaneStoryBoard() { + super("扩展面板"); + add(cell(new UIExpandablePane("扩展", createContentPane()))); + add(cell(new UIExpandablePane("扩展2", createContentPane2()))); + + } + + private JPanel createContentPane2() { + JPanel jPanel = new JPanel(); + UILabel label = new UILabel("扩展面板2"); + UIButton button = new UIButton("按钮2"); + jPanel.add(label, BorderLayout.WEST); + jPanel.add(button, BorderLayout.CENTER); + return jPanel; + } + + JPanel createContentPane() { + JPanel jPanel = new JPanel(); + UILabel label = new UILabel("扩展面板1"); + UIButton button = new UIButton("按钮1"); + jPanel.add(label, BorderLayout.WEST); + jPanel.add(button, BorderLayout.CENTER); + return jPanel; + } + + +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/IconStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/IconStoryBoard.java new file mode 100644 index 0000000000..e86582dd5f --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/IconStoryBoard.java @@ -0,0 +1,71 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.swing.ui.layout.Layouts; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.FineLightIconSet; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; + +import javax.swing.JLabel; +import javax.swing.SwingConstants; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; + +/** + * @author vito + * @since 11.0 + * Created on 2024/1/8 + */ +@Story +public class IconStoryBoard extends StoryBoard { + private FineLightIconSet iconSet = new FineLightIconSet(); + + public IconStoryBoard() { + super("图标"); + add(row( + column(10, + cell(new UILabel("普通图标")).with(this::h3), + icons() + ), + fix(5), + column(10, + cell(new UILabel("禁用图标")).with(this::h3), + disableIcons() + ), + fix(5), + column(10, + cell(new UILabel("白化图标")).with(this::h3), + whiteIcons() + )) + ); + } + + private Layouts.Cell icons() { + return column(10, + iconSet.getIds().stream().sorted() + .map(id -> cell(new JLabel(id, new LazyIcon(id), SwingConstants.LEFT))) + .toArray(Layouts.Cell[]::new)); + } + + private Layouts.Cell disableIcons() { + return column(10, + iconSet.getIds().stream().sorted() + .map(id -> cell(new JLabel(id, new LazyIcon(id).disabled(), SwingConstants.LEFT)) + .with(it -> { + it.setDisabledIcon(new LazyIcon(id).disabled()); + it.setEnabled(false); + })) + .toArray(Layouts.Cell[]::new)); + } + + private Layouts.Cell whiteIcons() { + return column(10, + iconSet.getIds().stream().sorted() + .map(id -> cell(new JLabel(id, new LazyIcon(id).white(), SwingConstants.LEFT))) + .toArray(Layouts.Cell[]::new)); + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/InputStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/InputStoryBoard.java new file mode 100644 index 0000000000..e18e7bc8f4 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/InputStoryBoard.java @@ -0,0 +1,70 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.data.datapane.management.search.pane.FineSearchPane; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.ispinner.UISpinner; +import com.fr.design.gui.itextarea.UITextArea; +import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor; + +import static com.fine.swing.ui.layout.Layouts.*; + +/** + * 输入框相关组件 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/14 + */ +public class InputStoryBoard extends StoryBoard { + public InputStoryBoard() { + super("输入框"); + add( + cell(new UILabel("文本框")).with(this::h3), + cell(new UITextField("文本")), + + cell(new UILabel("文本框-禁用")).with(this::h3), + cell(new UITextField("文本")).with(it -> it.setEnabled(false)), + + cell(new UILabel("文本域")).with(this::h3), + cell(new UITextArea("下面一些近期重要通知公告、常用CRM&KMS页面链接，希望可以帮到你哦~ " + + "或者你可以找我的两个好兄弟“Fine人事”、“ISC服务平台Fine人事”的工位在“企业微信工作台-ISC”下面，" + + "菜单栏里的内容可以解答一些常见问题 ISC服务平台”的工位在“CRM主页”，" + + "你也可以点此链接快速访问→ISC服务平台(finereporthelp.com)长远希望把它打造为一个全公司重要通知、" + + "常用入口的服务平台，如有意见建议，欢迎多多反馈Jewel-朱朱~如果觉得我可以帮到你，" + + "请滑到页面左下角给我点个赞吧(#^.^#)")), + + cell(new UILabel("文本域-禁用")).with(this::h3), + cell(new UITextArea("下面一些近期重要通知公告、常用CRM&KMS页面链接，" + + "希望可以帮到你哦~ 或者你可以找我的两个好兄弟“Fine人事”、" + + "“ISC服务平台Fine人事”的工位在“企业微信工作台-ISC”下面，" + + "菜单栏里的内容可以解答一些常见问题 ISC服务平台”的工位在“CRM主页”" + + "，你也可以点此链接快速访问→ISC服务平台(finereporthelp.com)长远希望把它打造为一个全公司重要通知、" + + "常用入口的服务平台，如有意见建议，欢迎多多反馈Jewel-朱朱~如果觉得我可以帮到你，" + + "请滑到页面左下角给我点个赞吧(#^.^#)")).with(it -> it.setEnabled(false)), + + cell(new UILabel("数字步进(0～100，步长:1)")).with(this::h3), + cell(new UISpinner(0, 100, 1, 50)), + + cell(new UILabel("数字步进-禁用")).with(this::h3), + cell(new UISpinner(0, 100, 1, 50)).with(it -> it.setEnabled(false)), + + cell(new UILabel("搜索框")).with(this::h3), + cell(new FineSearchPane()), + + cell(new UILabel("搜索框-禁用")).with(this::h3), + cell(new FineSearchPane()).with(it -> { + it.setEnabled(false); + it.setText("搜索文本"); + }), + + cell(new UILabel("输入框-更多，带按钮")).with(this::h3), + cell(new AccessibleBackgroundEditor()), + + cell(new UILabel("输入框-更多，带按钮-禁用")).with(this::h3), + cell(new AccessibleBackgroundEditor()).with(it -> it.setEnabled(false)) + ); + + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/JTestTemplate.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/JTestTemplate.java new file mode 100644 index 0000000000..72a97c5d3f --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/JTestTemplate.java @@ -0,0 +1,42 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.theme.icon.LazyIcon; +import com.fr.design.mainframe.JNullTemplate; +import com.fr.file.FILE; +import com.fr.file.MemFILE; + +import javax.swing.Icon; + +/** + * @author vito + * @since 11.0 + * Created on 2023/12/18 + */ +public class JTestTemplate extends JNullTemplate { + + private String name; + private FILE file; + + public JTestTemplate(String name) { + this.name = name; + this.file = new MemFILE(name); + } + + public String getTemplateName() { + return name; + } + + @Override + public Icon getIcon() { + return new LazyIcon("save"); + } + + public String getTemplateTabOperatorType(){ + return "DefaultTabOperator"; + } + + @Override + public FILE getEditingFILE() { + return file; + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/PopupMenuStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/PopupMenuStoryBoard.java new file mode 100644 index 0000000000..bd202b6f50 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/PopupMenuStoryBoard.java @@ -0,0 +1,124 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.imenu.UIMenuItem; +import com.fr.design.gui.imenu.UIPopupMenu; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.design.menu.DottedSeparator; +import com.fr.design.menu.NameSeparator; + +import javax.swing.Icon; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; +import javax.swing.KeyStroke; +import javax.swing.MenuElement; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.theme.utils.FineUIStyle.setStyle; +import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; + +/** + * 弹窗组件 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2024/1/8 + */ +@Story +public class PopupMenuStoryBoard extends StoryBoard { + public PopupMenuStoryBoard() { + super("弹窗"); + add( + column(70, + cell(new UIButton("点击展示弹窗")).with(it -> { + UIPopupMenu popupMenu = new UIPopupMenu(); + popupMenu.add(new UIMenuItem("test1")); + popupMenu.add(new UIMenuItem("test2", new LazyIcon("cellHyperLinkAttr"))); + popupMenu.addSeparator(); + popupMenu.add(new UIMenuItem("test3", new LazyIcon("cellClear"))); + popupMenu.add(new NameSeparator("分割线").createMenuItem()); + UIMenuItem menuItem = new UIMenuItem("test4", new LazyIcon("cellOtherAttr")); + menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, DEFAULT_MODIFIER)); + popupMenu.add(menuItem); + popupMenu.add(new DottedSeparator().createMenuItem()); + JMenu test5 = new JMenu("test5"); + test5.setIcon(new LazyIcon("cellExpandAttr")); + popupMenu.add(test5); + + + it.addMouseListener(new MouseAdapter() { + + + @Override + public void mouseClicked(MouseEvent e) { + popupMenu.show(it, e.getX(), e.getY()); + } + }); + }), + + cell(new UIButton("点击展示菜单栏弹窗")).with(it -> { + UIPopupMenu popupMenu = new UIPopupMenu(); + popupMenu.add(new UIMenuItem("test1")); + popupMenu.add(new UIMenuItem("test2", new LazyIcon("cellHyperLinkAttr"))); + popupMenu.addSeparator(); + popupMenu.add(new UIMenuItem("test3", new LazyIcon("cellClear"))); + popupMenu.add(new NameSeparator("分割线").createMenuItem()); + UIMenuItem menuItem = new UIMenuItem("test4", new LazyIcon("cellOtherAttr")); + menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, DEFAULT_MODIFIER)); + popupMenu.add(menuItem); + popupMenu.add(new DottedSeparator().createMenuItem()); + JMenu test5 = new JMenu("test5"); + test5.setIcon(new LazyIcon("cellExpandAttr")); + popupMenu.add(test5); + + it.addMouseListener(new MouseAdapter() { + + + @Override + public void mouseClicked(MouseEvent e) { + popupMenu.show(it, e.getX(), e.getY()); + } + }); + + setToolBarClientProperty(popupMenu); + }) + ) + ); + + } + + + private void setToolBarClientProperty(JPopupMenu jPopupMenu) { + setStyle(jPopupMenu, FineUIStyle.POPUP_MENU_TOOL_BAR); + + MenuElement[] subElements = jPopupMenu.getSubElements(); + for (MenuElement subElement : subElements) { + if (subElement instanceof JMenu) { + JMenu jMenu = (JMenu) subElement; + Icon icon = jMenu.getIcon(); + if (icon instanceof LazyIcon && jMenu.getSelectedIcon() == null) { + jMenu.setSelectedIcon(((LazyIcon) icon).white()); + } + JPopupMenu childPopupMenu = jMenu.getPopupMenu(); + setStyle(jMenu, FineUIStyle.MENU_TOOL_BAR); + setToolBarClientProperty(childPopupMenu); + } else if (subElement instanceof JMenuItem) { + JMenuItem jMenuItem = (JMenuItem) subElement; + Icon icon = jMenuItem.getIcon(); + if (icon instanceof LazyIcon && jMenuItem.getSelectedIcon() == null) { + jMenuItem.setSelectedIcon(((LazyIcon) icon).white()); + } + setStyle(jMenuItem, FineUIStyle.MENU_ITEM_TOOL_BAR); + } + } + } + +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/RadioButtonStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/RadioButtonStoryBoard.java new file mode 100644 index 0000000000..d4dd6f3eaa --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/RadioButtonStoryBoard.java @@ -0,0 +1,50 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.gui.ibutton.UIRadioButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.StoryBoard; + +import javax.swing.ButtonGroup; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + +/** + * RadioButton + * + * @author vito + * @since 11.0 + * Created on 2023/12/14 + */ +public class RadioButtonStoryBoard extends StoryBoard { + + ButtonGroup buttonGroup = new ButtonGroup(); + ButtonGroup buttonGroup1 = new ButtonGroup(); + + public RadioButtonStoryBoard() { + super("单选按钮"); + add( + cell(new UILabel("普通")).with(this::h3), + row(10, + cell(new UIRadioButton("选项一")).with(it -> { + buttonGroup.add(it); + buttonGroup.setSelected(it.getModel(), true); + }), + cell(new UIRadioButton("选项二")).with(it -> buttonGroup.add(it)), + cell(new UIRadioButton("选项三")).with(it -> buttonGroup.add(it)) + ), + cell(new UILabel("禁用状态")).with(this::h3), + row(10, + cell(new UIRadioButton("选项一")).with(it -> { + buttonGroup1.add(it); + buttonGroup1.setSelected(it.getModel(), true); + }), + cell(new UIRadioButton("选项二")).with(it -> buttonGroup1.add(it)), + cell(new UIRadioButton("选项三")).with(it -> { + buttonGroup1.add(it); + it.setEnabled(false); + }) + ) + ); + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/SelectBoxStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/SelectBoxStoryBoard.java new file mode 100644 index 0000000000..7ee5a63186 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/SelectBoxStoryBoard.java @@ -0,0 +1,44 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.design.style.background.texture.TextureSelectBox; +import com.fr.design.style.color.ColorSelectBox; +import com.fr.design.style.color.NewColorSelectPane; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; + +/** + * @author Levy.Xie + * @since 11.0 + * Created on 2023/12/18 + */ +@Story +public class SelectBoxStoryBoard extends StoryBoard { + + public SelectBoxStoryBoard() { + super("选择框面板"); + add( + cell(new UILabel("颜色下拉选择面板")).with(this :: h3), + cell(new MockColorSelectBox(50)), + cell(new UILabel("纹理下拉选择面板")).with(this :: h3), + cell(new TextureSelectBox(50)), + flex() + ); + } + + private static class MockColorSelectBox extends ColorSelectBox { + + public MockColorSelectBox(int preferredWidth) { + super(preferredWidth); + } + + @Override + protected NewColorSelectPane getColorSelectPane() { + return new NewColorSelectPane(true, true); + } + } + +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/SliderStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/SliderStoryBoard.java new file mode 100644 index 0000000000..96826f5bc5 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/SliderStoryBoard.java @@ -0,0 +1,43 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.islider.UISlider; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.design.style.background.gradient.GradientBar; + +import java.awt.Color; + +import static com.fine.swing.ui.layout.Layouts.*; + +/** + * 滑块 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/14 + */ +@Story +public class SliderStoryBoard extends StoryBoard { + public SliderStoryBoard() { + super("滑块"); + add( + cell(new UILabel("无标签滑块")).with(this::h3), + row(cell(new UISlider()).with(it -> { + it.setValue(50); + it.setMaximum(100); + it.setMinimum(0); + })), + cell(new UILabel("带标签滑块")).with(this::h3), + row(cell(new UISlider()).with(it -> { + it.setPaintLabels(true); + it.setMajorTickSpacing(90); + it.setValue(40); + it.setMaximum(90); + it.setMinimum(-90); + })), + cell(new UILabel("渐变色滑块")).with(this::h3), + row(cell(new GradientBar(6, 150)).with(it -> it.updateColor(new Color(55, 104, 196), new Color(180, 97, 39)))) + ); + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/TabbedPaneStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/TabbedPaneStoryBoard.java new file mode 100644 index 0000000000..196b77615f --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/TabbedPaneStoryBoard.java @@ -0,0 +1,63 @@ +package com.fr.design.gui.storybook.components; + +import com.formdev.flatlaf.util.ScaledEmptyBorder; +import com.fr.design.gui.frpane.FineTabbedPane; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.storybook.StoryBoard; + +import java.awt.Component; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + +/** + * @author Levy.Xie + * @since 11.0 + * Created on 2024/05/22 + */ +public class TabbedPaneStoryBoard extends StoryBoard { + public TabbedPaneStoryBoard() { + super("切换标题面板"); + add( + cell(createSampleTabPane()), + cell(createSampleTabPaneWithRatio(0.8f)), + cell(createMultiRowTab()) + ); + } + + private FineTabbedPane createSampleTabPane() { + + return FineTabbedPane.builder() + .addTab("测试1", getSampleCell(1)) + .addTab("测试2", getSampleCell(2)) + .build(); + } + + private FineTabbedPane createSampleTabPaneWithRatio(float ratio) { + + return FineTabbedPane.builder() + .addTab("测试1", getSampleCell(1)) + .addTab("测试2", getSampleCell(2)) + .withHeadRatio(ratio) + .build(); + } + + private FineTabbedPane createMultiRowTab() { + + return FineTabbedPane.builder() + .addTab("测试1", getSampleCell(1)) + .addTab("测试2", getSampleCell(2)) + .addTab("测试3", getSampleCell(3)) + .addTab("测试4", getSampleCell(4)) + .addTab("测试5", getSampleCell(5)) + .withTabLayout(new int[]{2,3}) + .build(); + } + + private Component getSampleCell(int seq) { + return column(10, + cell(new UIButton(seq + "-按钮1")), cell(new UIButton(seq + "-按钮2")) + ).with(it -> it.setBorder(new ScaledEmptyBorder(10, 10, 10, 10))).getComponent(); + } + +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/TableStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/TableStoryBoard.java new file mode 100644 index 0000000000..62ee55fa40 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/TableStoryBoard.java @@ -0,0 +1,103 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.theme.light.ui.FineRoundBorder; +import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.icontainer.UITableScrollPane; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itable.FineUITable; +import com.fr.design.gui.storybook.StoryBoard; + +import javax.swing.*; +import javax.swing.plaf.UIResource; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableCellRenderer; + +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + +public class TableStoryBoard extends StoryBoard { + public TableStoryBoard() { + super("表格"); + + DefaultTableModel model1 = new DefaultTableModel(new Object[][] { + {"1", "Alice", "Female", "Engineering"}, + {"2", "Bob", "Male", "Marketing"}, + {"3", "Carol", "Female", "Design"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"}, + {"4", "Dave", "Male", "Finance"} + }, new String[] {"ID", "Name", "Gender", "Department"}); + FineUITable table1 = new FineUITable(model1); + + DefaultTableModel model2 = new DefaultTableModel(new Object[][] { + {"1", "Alice", "Female", "Engineering"}, + {"2", "Bob", "Male", "Marketing"}, + {"3", "Carol", "Female", "Design"}, + {"4", "Dave", "Male", "Finance"} + }, new String[] {"ID", "Name", "Gender", "Department"}); + FineUITable table2 = new FineUITable(model2); + + DefaultTableModel model3 = new DefaultTableModel(new Object[][] { + {false, "1", "Alice", "Female", "Engineering"}, + {false, "2", "Bob", "Male", "Marketing"}, + {false, "3", "Carol", "Female", "Design"}, + {false, "4", "Dave", "Male", "Finance"} + }, new String[] {"选中", "ID", "Name", "Gender", "Department"}) { + private static final long serialVersionUID = 1L; + Class[] types = new Class[]{Boolean.class, UILabel.class, UILabel.class, UILabel.class, UILabel.class}; + + public Class getColumnClass(int columnIndex) { + return types[columnIndex]; + } + }; + FineUITable table3 = new FineUITable(model3); + table3.getTableHeader().getColumnModel().getColumn(0).setCellRenderer(new BooleanRenderer()); + + add(column(20, cell(new UITableScrollPane(table1)).with(this::setFixSize), + cell(new UIScrollPane(table2)).with(this::setFixSize), + cell(new UIScrollPane(table3)).with(this::setFixSize)).getComponent()); + } + + + private void setFixSize(JComponent component) { + component.setPreferredSize(new Dimension(component.getWidth(), 150)); + component.setBorder(new FineRoundBorder()); + } + + public static class BooleanRenderer extends JCheckBox implements TableCellRenderer, UIResource { + public BooleanRenderer() { + super(); + setHorizontalAlignment(JLabel.CENTER); + setOpaque(false); + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + setSelected((value != null && ((Boolean) value).booleanValue())); + setBorder(BorderFactory.createMatteBorder(0, 0, 1, 1, UIManager.getColor("defaultBorderColor"))); + setBackground(Color.WHITE); + return this; + } + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/TablelayoutStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/TablelayoutStoryBoard.java new file mode 100644 index 0000000000..c99995d60d --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/TablelayoutStoryBoard.java @@ -0,0 +1,169 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.swing.ui.layout.Layouts; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.design.layout.TableLayout; +import com.fr.design.layout.TableLayoutHelper; +import org.jetbrains.annotations.NotNull; + +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.Color; +import java.awt.Component; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fr.design.layout.TableLayoutHelper.createDiffVGapTableLayoutPane; +import static com.fr.design.layout.TableLayoutHelper.createGapTableLayoutPane; +import static com.fr.design.layout.TableLayoutHelper.createTableLayoutPane; + +/** + * 表格布局展示 + *
+ * TableLayout 来自开源项目 + * TableLayout + * + * @author vito + * @since 11.0 + * Created on 2024/1/31 + */ +public class TablelayoutStoryBoard extends StoryBoard { + + + private static final double P = TableLayout.PREFERRED; + private static final double F = TableLayout.FILL; + + public TablelayoutStoryBoard() { + + super("Tablelayout"); + add( + cell(new UILabel("简单布局")).with(this::h3), + layout1(), + + cell(new UILabel("TableLayoutHelper 快速创建")).with(this::h3), + row( + cell(createTableLayoutPane(createTestComponents("jp1"), TableLayoutHelper.FILL_NONE)) + .with(it -> it.setBorder(BorderFactory.createLineBorder(Color.red))).weight(1), + + cell(createGapTableLayoutPane(createTestComponents("jp2"), + TableLayoutHelper.FILL_LASTCOL_AND_ROW, 20, 20)) + .with(it -> it.setBorder(BorderFactory.createLineBorder(Color.red))).weight(1), + + cell(createGapTableLayoutPane(createTestComponents("jp3"), + new double[]{F, P, F, P}, new double[]{F, F}, 4, 4)) + .with(it -> it.setBorder(BorderFactory.createLineBorder(Color.red))).weight(1) + ), + row( + cell(createGapTableLayoutPane(createTestComponents("jp4"), + new double[]{P, 50, P, P, P, P}, new double[]{P, F}, new int[][]{{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}, 1, 5)) + .with(it -> it.setBorder(BorderFactory.createLineBorder(Color.red))).weight(1), + + cell(createDiffVGapTableLayoutPane(createTestComponents("jp5"), + new double[]{P, P, P, P, P}, new double[]{P, F}, 4, new double[]{4, 8, 14, 4})) + .with(it -> it.setBorder(BorderFactory.createLineBorder(Color.red))).weight(1) + ) + + + ); + } + + + private static Component[][] createTestComponents(String name) { + UILabel label1 = new UILabel(name + "laaaable1"); + UILabel label2 = new UILabel(name + "lable2"); + UILabel label3 = new UILabel(name + "lable3"); + UILabel label4 = new UILabel(name + "lable4"); + UILabel label5 = new UILabel(name + "lable5"); + UIButton button1 = new UIButton(name + "button1"); + UIButton button2 = new UIButton(name + "button2"); + label1.setSize(label1.getPreferredSize()); + label1.setBorder(BorderFactory.createLineBorder(Color.blue)); + label2.setSize(label2.getPreferredSize()); + label2.setBorder(BorderFactory.createLineBorder(Color.blue)); + label3.setSize(label3.getPreferredSize()); + label3.setBorder(BorderFactory.createLineBorder(Color.blue)); + label4.setSize(label4.getPreferredSize()); + label4.setBorder(BorderFactory.createLineBorder(Color.blue)); + label5.setSize(label5.getPreferredSize()); + label5.setBorder(BorderFactory.createLineBorder(Color.blue)); + button1.setSize(button1.getPreferredSize()); + button2.setSize(button2.getPreferredSize()); + return new Component[][]{ + new Component[]{label1, button1}, + new Component[]{label2, null}, + new Component[]{label3}, + new Component[]{null, label4}, + new Component[]{button2, label5} + }; + } + + /** + * 图示 {@link /com/fr/design/gui/storybook/components/Preferred.gif} + */ + private Layouts.Cell layout1() { + + JPanel pane = getTableLayoutPanel(); + + // Create all controls + UILabel labelName = new UILabel("Name"); + UILabel labelAddress = new UILabel("Address"); + UILabel labelCity = new UILabel("City"); + UILabel labelState = new UILabel("State"); + UILabel labelZip = new UILabel("Zip"); + + UITextField textfieldName = new UITextField(10); + UITextField textfieldAddress = new UITextField(20); + UITextField textfieldCity = new UITextField(10); + UITextField textfieldState = new UITextField(2); + UITextField textfieldZip = new UITextField(5); + + UIButton buttonOk = new UIButton("OK"); + UIButton buttonCancel = new UIButton("Cancel"); + JPanel panelButton = new JPanel(); + panelButton.add(buttonOk); + panelButton.add(buttonCancel); + + // Add all controls + pane.add(labelName, "1, 1, 5, 1"); + pane.add(textfieldName, "1, 3, 5, 3"); + pane.add(labelAddress, "1, 5, 5, 5"); + pane.add(textfieldAddress, "1, 7, 5, 7"); + pane.add(labelCity, "1, 9"); + pane.add(textfieldCity, "1, 11"); + pane.add(labelState, "3, 9"); + pane.add(textfieldState, "3, 11"); + pane.add(labelZip, "5, 9"); + pane.add(textfieldZip, "5, 11"); + pane.add(panelButton, "1, 13, 5, 13"); + return cell(pane); + } + + @NotNull + private static JPanel getTableLayoutPanel() { + JPanel pane = new JPanel(); + // b - border + // f - FILL + // p - PREFERRED + // vs - vertical space between labels and text fields + // vg - vertical gap between form elements + // hg - horizontal gap between form elements + + double b = 10; + double f = TableLayout.FILL; + double p = TableLayout.PREFERRED; + double vs = 5; + double vg = 10; + double hg = 10; + + double[][] size = + {{b, f, hg, p, hg, p, b}, + {b, p, vs, p, vg, p, vs, p, vg, p, vs, p, vg, p, b}}; + + TableLayout layout = new TableLayout(size); + pane.setLayout(layout); + return pane; + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/TemplateTabStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/TemplateTabStoryBoard.java new file mode 100644 index 0000000000..062bdf0ba2 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/TemplateTabStoryBoard.java @@ -0,0 +1,35 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.file.HistoryTemplateListCache; +import com.fr.design.file.MultiTemplateTabPane; +import com.fr.design.gui.storybook.Story; +import com.fr.design.gui.storybook.StoryBoard; +import com.fr.value.NullableLazyValue; + +/** + * 新建模版Tab + * + * @author vito + * @since 11.0 + * Created on 2023/11/27 + */ +@Story +public class TemplateTabStoryBoard extends StoryBoard { + + final static NullableLazyValue init = NullableLazyValue.createValue(() -> { + HistoryTemplateListCache.getInstance().setCurrentEditingTemplate(new JTestTemplate("ghjffdhsakjfjdks.cpt")); + HistoryTemplateListCache.getInstance().setCurrentEditingTemplate(new JTestTemplate("模版1.cpt")); + HistoryTemplateListCache.getInstance().setCurrentEditingTemplate(new JTestTemplate("模版.cpt")); + HistoryTemplateListCache.getInstance().setCurrentEditingTemplate(new JTestTemplate("模版1.cpt")); + HistoryTemplateListCache.getInstance().setCurrentEditingTemplate(new JTestTemplate("模版模版模版模版.cpt")); + return null; + }); + + public TemplateTabStoryBoard() { + super("新建模版Tab"); + + init.getValue(); + add(MultiTemplateTabPane.getInstance()); + } + +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/ToggleButtonStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ToggleButtonStoryBoard.java new file mode 100644 index 0000000000..b60be87e66 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ToggleButtonStoryBoard.java @@ -0,0 +1,32 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.theme.icon.LazyIcon; +import com.fr.design.gui.storybook.StoryBoard; + +import javax.swing.JToggleButton; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + +/** + * 切换状态按钮 + * + * @author vito + * @since 11.0 + * Created on 2023/11/27 + */ +public class ToggleButtonStoryBoard extends StoryBoard { + + public ToggleButtonStoryBoard() { + super("切换按钮"); + add( + row(10, + cell(new JToggleButton("切换按钮")), + cell(new JToggleButton("长文字保存保存保存保存", new LazyIcon("save"))), + cell(new JToggleButton(new LazyIcon("multi"))) + ), + flex() + ); + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/ToolTipStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ToolTipStoryBoard.java new file mode 100644 index 0000000000..e5cbd1d704 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/ToolTipStoryBoard.java @@ -0,0 +1,37 @@ +package com.fr.design.gui.storybook.components; + +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.StoryBoard; + +import static com.fine.swing.ui.layout.Layouts.*; + +/** + * 提示框 + * + * @author Leo.Qin + * @since 11.0 + * Created on 2023/12/14 + */ +public class ToolTipStoryBoard extends StoryBoard { + public ToolTipStoryBoard() { + super("提示框"); + add( + cell(new UILabel("组件启用状态下的提示")).with(this::h3), + cell(new UIButton("组件")).with(it -> it.setToolTipText("组件启用状态下的提示")), + cell(new UILabel("组件禁用状态下的提示")).with(this::h3), + cell(new UIButton("组件")).with(it -> { + it.setEnabled(false); + it.setToolTipText("组件禁用状态下的提示"); + }), + cell(new UILabel("较长提示")).with(this::h3), + cell(new UIButton("组件")).with(it -> it.setToolTipText("下面一些近期重要通知公告、常用CRM&KMS页面链接，" + + "希望可以帮到你哦~ 或者你可以找我的两个好兄弟“Fine人事”、" + + "“ISC服务平台Fine人事”的工位在“企业微信工作台-ISC”下面，" + + "菜单栏里的内容可以解答一些常见问题 ISC服务平台”的工位在“CRM主页”，" + + "你也可以点此链接快速访问→ISC服务平台(finereporthelp.com)长远希望把它打造为一个全公司重要通知、" + + "常用入口的服务平台，如有意见建议，欢迎多多反馈Jewel-朱朱~" + + "如果觉得我可以帮到你，请滑到页面左下角给我点个赞吧(#^.^#)")) + ); + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/UIHeadGroupStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/UIHeadGroupStoryBoard.java new file mode 100644 index 0000000000..b7223fa0c1 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/UIHeadGroupStoryBoard.java @@ -0,0 +1,66 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.theme.icon.LazyIcon; +import com.fr.design.gui.ibutton.UIHead; +import com.fr.design.gui.ibutton.UIHeadGroup; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.StoryBoard; + +import java.util.ArrayList; +import java.util.List; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; + +/** + * 属性面板tab + * + * @author vito + * @since 11.0 + * Created on 2023/11/27 + */ +public class UIHeadGroupStoryBoard extends StoryBoard { + + public UIHeadGroupStoryBoard() { + super("属性面板&导入数据集tab"); + add( + cell(new UILabel("文字Tab")).with(this::h3), + cell(new UIHeadGroup(new String[]{"左按钮", "右按钮"})), + cell(new UILabel("图标Tab")).with(this::h3), + cell(new UIHeadGroup(iconList())), + cell(new UILabel("文字Tab带禁用")).with(this::h3), + cell(new UIHeadGroup(iconList2())), + cell(new UILabel("文字图标Tab带禁用")).with(this::h3), + cell(new UIHeadGroup(iconList3())), + flex() + ); + } + + public static List iconList() { + List uiHeads = new ArrayList<>(); + uiHeads.add(new UIHead(new LazyIcon("cut"))); + uiHeads.add(new UIHead(new LazyIcon("save"))); + return uiHeads; + } + + public static List iconList2() { + List uiHeads = new ArrayList<>(); + uiHeads.add(new UIHead(new LazyIcon("cut"))); + uiHeads.add(new UIHead(new LazyIcon("save"), false)); + return uiHeads; + } + + public static List iconList3() { + List uiHeads = new ArrayList<>(); + uiHeads.add(new UIHead("剪切", new LazyIcon("cut"))); + uiHeads.add(new UIHead("保存", new LazyIcon("save"), false)); + return uiHeads; + } + + public static List iconList4() { + List uiHeads = new ArrayList<>(); + uiHeads.add(new UIHead("剪切剪切剪切剪切剪切剪切剪切剪切剪切", new LazyIcon("cut"))); + uiHeads.add(new UIHead("保存", new LazyIcon("save"), false)); + return uiHeads; + } +} diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/UIScrollPaneStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/UIScrollPaneStoryBoard.java new file mode 100644 index 0000000000..a485942422 --- /dev/null +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/UIScrollPaneStoryBoard.java @@ -0,0 +1,77 @@ +package com.fr.design.gui.storybook.components; + +import com.fine.swing.ui.layout.Column; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIUtils; +import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.storybook.StoryBoard; + +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.ScrollPaneConstants; +import java.awt.Dimension; +import java.util.Collections; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; + +/** + * 滚动面板 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2024/01/25 + */ +public class UIScrollPaneStoryBoard extends StoryBoard { + public UIScrollPaneStoryBoard() { + super("滚动面板"); + add( + row(20, + column( + cell(new UILabel("滚动条常驻显示")).with(this::h2), + cell(new UILabel("水平/纵向")).with(this::h2), + cell(new UIScrollPane(createMultiLabelPane())).with(this::setFixSize), + cell(new UILabel("水平")).with(this::h3), + cell(new UIScrollPane(createMultiLabelPane(), + ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED)) + .with(this::setFixSize), + cell(new UILabel("纵向")).with(this::h3), + cell(new UIScrollPane(createMultiLabelPane(), + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER)) + .with(this::setFixSize) + ).weight(1), + + column( + cell(new UILabel("滚动条悬浮显示")).with(this::h2), + cell(new UILabel("水平/纵向")).with(this::h3), + cell(FineUIUtils.createCollapsibleScrollBarLayer(createMultiLabelPane())).with(it -> setFixSize(it.getView())), + cell(new UILabel("水平")).with(this::h3), + cell(FineUIUtils.createCollapsibleScrollBarLayer(createMultiLabelPane(), + ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED + )).with(it -> setFixSize(it.getView())), + cell(new UILabel("纵向")).with(this::h3), + cell(FineUIUtils.createCollapsibleScrollBarLayer(createMultiLabelPane(), + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER + )).with(it -> setFixSize(it.getView()) + ) + ).weight(1) + ) + ); + } + + private JPanel createMultiLabelPane() { + Column column = new Column(); + for (int i = 0; i < 10; i++) { + column.add(new UILabel(String.join(" ", Collections.nCopies(20, "test")))); + } + return column; + } + + private void setFixSize(JComponent component) { + component.setPreferredSize(new Dimension(component.getWidth(), 100)); + component.setBorder(new FineRoundBorder()); + } + +} diff --git a/designer-base/src/test/resources/com/fr/design/gui/storybook/components/Preferred.gif b/designer-base/src/test/resources/com/fr/design/gui/storybook/components/Preferred.gif new file mode 100644 index 0000000000..88e9c2dfab Binary files /dev/null and b/designer-base/src/test/resources/com/fr/design/gui/storybook/components/Preferred.gif differ diff --git a/designer-chart/build.chart.gradle b/designer-chart/build.chart.gradle index 806b92aaba..943404fc84 100644 --- a/designer-chart/build.chart.gradle +++ b/designer-chart/build.chart.gradle @@ -63,7 +63,7 @@ dependencies{ compile fileTree(dir:"../${baseDir}/lib-core",include:'**/*.jar') compile fileTree(dir:"../${baseDir}/lib-design",include:'**/*.jar') compile fileTree(dir:"../${baseDir}",include:"**/build/libs/*.jar",exclude:"bi/**/*.jar") - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' } //复制非.java文件到classes文件夹下参与打包 task copyFile(type:Copy,dependsOn:compileJava){ diff --git a/designer-chart/build.gradle b/designer-chart/build.gradle index e59f9ef2f8..3d646c1b93 100644 --- a/designer-chart/build.gradle +++ b/designer-chart/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile project(':designer-base') + api project(':designer-base') } diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java index b7c9c474e4..e10d9c6dcf 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -242,15 +242,28 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr return getName(plotID); } + /** + * 获取图标Path + * @param plotID + * @return iconPath + */ public String getIconPath(String plotID) { + ChartTypeUIProvider provider = getChartTypeProvider(plotID); + return provider != null ? provider.getIconPath() : StringUtils.EMPTY; + } - if (chartTypeUIs != null) { - ChartTypeUIProvider provider = getChartTypeInterface(plotID); - if (provider != null) { - return provider.getIconPath(); - } - } - return StringUtils.EMPTY; + /** + * 获取新图标id + * @param plotID + * @return iconId + */ + public String getIconId(String plotID) { + ChartTypeUIProvider provider = getChartTypeProvider(plotID); + return provider != null ? provider.getIconId() : StringUtils.EMPTY; + } + + private ChartTypeUIProvider getChartTypeProvider(String plotID) { + return chartTypeUIs != null ? getChartTypeInterface(plotID) : null; } public String[] getDemoImagePath(String chartID) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java index 183f14b768..6af8a112e5 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java @@ -1,5 +1,6 @@ package com.fr.design.chart; +import com.fine.theme.utils.FineUIStyle; import com.fr.base.chart.BaseChartCollection; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.dialog.BasicDialog; @@ -54,6 +55,8 @@ public class ChartDialog extends MiddleChartDialog { ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); + FineUIStyle.setStyle(ok, FineUIStyle.STYLE_PRIMARY); + this.applyClosingAction(); this.applyEscapeAction(); this.setBasicDialogSize(BasicDialog.DEFAULT); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java b/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java index 3ae8f0b848..2b51b3b9e4 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java @@ -1,5 +1,6 @@ package com.fr.design.chart; +import com.fine.theme.utils.FineUIScale; import com.fr.base.ScreenResolution; import com.fr.base.chart.BaseChartPainter; import com.fr.base.chart.chartdata.CallbackEvent; @@ -13,18 +14,18 @@ import com.fr.stable.xml.XMLable; import com.fr.stable.xml.XMLableReader; import javax.swing.Icon; +import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Component; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Paint; /** * 图表的缩略图Icon, 在选择图表类型界面 用到. */ public class ChartIcon implements Icon, XMLable { - private static final int WIDTH = 400; - private static final int HEIGHT = 225; + private static final int WIDTH = FineUIScale.scale(215); + private static final int HEIGHT = FineUIScale.scale(100); private ChartCollection chartCollection; @@ -78,26 +79,23 @@ public class ChartIcon implements Icon, XMLable { public void paintIcon(Component c, Graphics g, int x, int y) { BaseChartPainter chartPainter = getChartPainter(); + Graphics2D g2d = (Graphics2D) g.create(); - //插入图表的宽度是固定的，resolution直接获取屏幕分辨率，resolution现在只会影响到老图表 - int resolution = ScreenResolution.getScreenResolution(); + g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0f)); - Graphics2D g2d = (Graphics2D) g; - Paint oldPaint = g2d.getPaint(); - g.translate(x, y); - g2d.setPaint(Color.white); + g2d.setColor(new Color(0, 0, 0, 0)); g2d.fillRect(0, 0, getIconWidth(), getIconHeight()); - chartPainter.paint(g2d, getIconWidth(), getIconHeight(), resolution, null, callbackEvent); + g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f)); - g.translate(-x, -y); - g2d.setPaint(oldPaint); + chartPainter.paint(g2d, getIconWidth(), getIconHeight(), ScreenResolution.getScreenResolution(), null, callbackEvent); + + g2d.dispose(); } protected BaseChartPainter getChartPainter() { - BaseChartPainter painter = chartCollection.createResultChartPainterWithOutDealFormula(Calculator.createCalculator(), + return chartCollection.createResultChartPainterWithOutDealFormula(Calculator.createCalculator(), WebChartIDInfo.createEmptyDesignerInfo(), getIconWidth(), getIconHeight()); - return painter; } diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java index c34fcce653..1cfdde0a19 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java @@ -3,16 +3,23 @@ package com.fr.design.chart; * the Pane of the Chart */ +import com.fine.swing.ui.layout.Column; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.charttypes.ChartTypeManager; import com.fr.chartx.attr.ChartProvider; import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.base.mode.DesignModeContext; +import com.fr.design.border.FineBorderFactory; +import com.fr.design.border.UIRoundedBorder; +import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.chart.info.ChartInfoCollector; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.van.chart.config.DefaultStyleHelper4Van; @@ -20,10 +27,12 @@ import com.fr.van.chart.config.DefaultStyleHelper4Van; import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListModel; +import javax.swing.JLayer; import javax.swing.JList; +import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JSplitPane; import javax.swing.ListCellRenderer; +import javax.swing.SwingConstants; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import java.awt.Color; @@ -31,6 +40,10 @@ import java.awt.Component; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; + public class ChartTypePane extends ChartCommonWizardPane implements CallbackEvent { private static final long serialVersionUID = -1175602484968520546L; @@ -56,9 +69,9 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven defaultListModel.insertElementAt(ChartTypeInterfaceManager.getInstance().getName(chartIDs[i]), i); } mainTypeList.addListSelectionListener(listSelectionListener); + FineUIStyle.setStyle(mainTypeList, FineUIStyle.PURE_LIST); - JScrollPane typeScrollPane = new JScrollPane(mainTypeList); - typeScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + JLayer typeScrollPane = FineUIUtils.createCollapsibleScrollBarLayer(mainTypeList); iconViewList = new JList(); @@ -67,15 +80,18 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven iconViewList.setVisibleRowCount(0); iconViewList.setLayoutOrientation(JList.HORIZONTAL_WRAP); iconViewList.setCellRenderer(iconCellRenderer); + iconViewList.setLayoutOrientation(JList.HORIZONTAL_WRAP); JScrollPane subListPane = new JScrollPane(iconViewList); //iconPane.add mainTypeList.setSelectedIndex(0); - JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane); - spane.setDividerLocation(120); - spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"))); - this.add(spane); + JPanel leftPanel = FineLayoutBuilder.asBorderLayoutWrapped(typeScrollPane); + leftPanel.setBorder(FineBorderFactory.createWrappedRoundBorder()); + + JPanel center = FineLayoutBuilder.createHorizontalLayout(0, new double[]{1, 2.5}, leftPanel, subListPane); + center.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); + this.add(center); iconViewList.setSelectedIndex(0); } @@ -84,19 +100,23 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven private static final long serialVersionUID = 956888843609479566L; public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - this.setText(""); if (value instanceof ChartIcon) { - this.setIcon((ChartIcon) value); - setHorizontalAlignment(UILabel.CENTER); ChartIcon chartIcon = (ChartIcon) value; - if (isSelected) { - // 深蓝色. - this.setBackground(new Color(57, 107, 181)); - this.setBorder(GUICoreUtils.createTitledBorder(getChartName(chartIcon), Color.WHITE)); - } else { - this.setBorder(GUICoreUtils.createTitledBorder(getChartName(chartIcon))); - } + UILabel centerImg = new UILabel(chartIcon); + UILabel text = new UILabel(getChartName(chartIcon), SwingConstants.CENTER); + + Column component = column( + fix(5), + cell(centerImg), cell(text), + fix(5) + ).getComponent(); + Color borderColor = isSelected ? FineUIUtils.getUIColor("defaultHighlightBorderColor", "Component.focusedBorderColor") + : FineUIUtils.getUIColor("defaultBorderColor", "Component.borderColor"); + UIRoundedBorder roundedBorder = new UIRoundedBorder(borderColor, 1, 5); + component.setBorder(BorderFactory.createCompoundBorder( + new ScaledEmptyBorder(0, 10, 10, 0), roundedBorder)); + component.setBackground(Color.WHITE); + return component; } return this; diff --git a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java index 59f1e397a1..0625a3e1fa 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java @@ -1,5 +1,6 @@ package com.fr.design.chart.comp; +import com.fine.theme.utils.FineUIScale; import com.fr.design.gui.ilable.UILabel; import com.fr.stable.Constants; @@ -10,6 +11,9 @@ import com.fr.design.style.color.ColorSelectBox; import java.awt.*; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + public class BorderAttriPane extends BasicPane { private LineComboBox lineCombo; @@ -20,16 +24,14 @@ public class BorderAttriPane extends BasicPane { } public BorderAttriPane(String lineString, String colorSting) { - this.setLayout(new FlowLayout(FlowLayout.LEFT, 2, 0)); - - this.add(new UILabel(lineString + ":")); - this.add(lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART)); - lineCombo.setPreferredSize(new Dimension(60, 18)); - - this.add(new UILabel(colorSting + ":")); - this.add(colorSelectBox = new ColorSelectBox(80)); - colorSelectBox.setPreferredSize(new Dimension(60, 18)); + this.setLayout(new BorderLayout()); + lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); + colorSelectBox = new ColorSelectBox(80); + colorSelectBox.setPreferredSize(FineUIScale.scale(new Dimension(60, 24))); colorSelectBox.setSelectObject(null); + + this.add(row(10, row(cell(new UILabel(lineString + ":")), cell(lineCombo)), + row(cell(new UILabel(colorSting + ":"))), cell(colorSelectBox)).getComponent(), BorderLayout.WEST); } public void setLineColor(Color color) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java b/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java index 10ee1bc8ae..3c22b0152a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java @@ -14,6 +14,7 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.plugin.injectable.SpecialLevel; +import com.fr.stable.StringUtils; import com.fr.stable.fun.Level; /** @@ -87,6 +88,13 @@ public interface ChartTypeUIProvider extends Level { */ String getIconPath(); + /** + * 图标Id + * @return 图标Id + */ + default String getIconId() { + return StringUtils.EMPTY; + } //todo:把下面这些接口删除 @Deprecated diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java index 649210f389..79ce1f817c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java +++ b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java @@ -107,6 +107,11 @@ public abstract class AbstractIndependentChartsUI extends AbstractProvider imple return "com/fr/design/images/form/toolbar/ChartF-Column.png"; } + @Override + public String getIconId() { + return "chart_column"; + } + @Override public ChartEditPane getChartEditPane(String plotID) { return new ChartsEditPane(); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java index aa8c9e46c8..09f2c77060 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java @@ -18,7 +18,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import java.util.Iterator; import java.awt.BorderLayout; -import java.awt.Dimension; /** * Created by IntelliJ IDEA. @@ -68,8 +67,6 @@ public class DataSeriesConditionPane extends ConditionAttributesPane it.setBorder(new ScaledEmptyBorder(5, 5, 5, 0))).getComponent()); - this.add(nameLabel); - this.add(panel); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java index 676fef17dc..2f877a9546 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java @@ -1,5 +1,6 @@ package com.fr.design.chart.series.SeriesCondition; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.chart.comp.BorderAttriPane; import com.fr.design.condition.ConditionAttrSingleConditionPane; @@ -7,6 +8,9 @@ import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.ilable.UILabel; import com.fr.stable.StringUtils; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; + /** * @author richie * @date 2015-03-26 @@ -25,12 +29,16 @@ public abstract class LabelBorderAttrPane extends ConditionAttrSingleConditionPa super(conditionAttributesPane, isRemove); nameLabel = new UILabel(label); linePane = initBorderAttrPane(); + nameLabel.setVisible(false); if (isRemove) { - this.add(nameLabel); + nameLabel.setVisible(true); } - this.add(linePane); this.labelName = label; + + this.add(row(cell(nameLabel).weight(0.2), cell(linePane).weight(0.8)) + .with(it -> it.setBorder(new ScaledEmptyBorder(5, 5, 5, 0))).getComponent()); + } protected BorderAttriPane initBorderAttrPane(){ diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelContentsPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelContentsPane.java index 19e7a1305b..d3f96672e5 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelContentsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelContentsPane.java @@ -54,6 +54,13 @@ public class LabelContentsPane extends ConditionAttrSingleConditionPane { private static final long serialVersionUID = 2469115951510144738L; - private static final int EDIT_PANE_WIDTH = 248; + private static final int EDIT_PANE_WIDTH = FineUIScale.scale(248); private UITextField itemNameTextField; private ChartHyperEditPane hyperEditPane; private ChartComponent chartComponent; @@ -55,7 +56,7 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane { } private void initRefreshLabel() { - Icon refreshImage = BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"); + Icon refreshImage = new LazyIcon("refresh"); refreshLabel = new UILabel(refreshImage); refreshLabel.addMouseListener(new MouseAdapter() { boolean mouseEntered = false; diff --git a/designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java b/designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java index 8534ed4b72..d1dde45957 100644 --- a/designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java +++ b/designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java @@ -3,6 +3,7 @@ */ package com.fr.design.gui.xcombox; +import com.fine.theme.utils.FineUIScale; import com.fr.base.FRContext; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; @@ -107,7 +108,7 @@ public class MarkerComboBox extends UIComboBox { } public Dimension getPreferredSize() { - return new Dimension(36, 16); + return FineUIScale.scale(new Dimension(36, 16)); } public Dimension getMinimumSize() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java index 297245960d..48ba6f2d5e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java @@ -4,6 +4,8 @@ package com.fr.design.mainframe; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.base.chart.BaseChartCollection; import com.fr.chart.chartattr.ChartCollection; @@ -21,8 +23,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.SwingWorker; -import java.awt.BorderLayout; -import java.awt.Component; +import java.awt.*; public class ChartPropertyPane extends BaseChartPropertyPane { @@ -43,7 +44,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane { protected void initComponent() { this.setLayout(new BorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + this.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); + // 外部轮廓大小固定，适配滚动面板 + this.setPreferredSize(new Dimension(getWidth(), FineUIScale.scale(900))); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/AbstractChartAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/AbstractChartAttrPane.java index c3beef7570..e3dff4837a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/AbstractChartAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/AbstractChartAttrPane.java @@ -4,8 +4,7 @@ package com.fr.design.mainframe.chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; -import javax.swing.*; -import java.awt.*; +import java.awt.BorderLayout; public abstract class AbstractChartAttrPane extends AbstractAttrNoScrollPane { public abstract void populate(ChartCollection collection); @@ -30,7 +29,6 @@ public abstract class AbstractChartAttrPane extends AbstractAttrNoScrollPane { protected void initContentPane() { leftContentPane = createContentPane(); - leftContentPane.setBorder(BorderFactory.createMatteBorder(10, 0, 0, 0, original)); this.add(leftContentPane, BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java index 6064ef89d0..0589ad8321 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java @@ -102,7 +102,6 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare } } }; - tabsHeaderIconPane.setNeedLeftRightOutLine(false); this.add(tabsHeaderIconPane, BorderLayout.NORTH); this.add(center, BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index 76a1295cd0..58c027fc42 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -4,6 +4,8 @@ package com.fr.design.mainframe.chart.gui; * Created by hufan on 2016/10/20. */ +import com.fine.theme.utils.FineLayoutBuilder; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseFormula; import com.fr.base.Utils; import com.fr.chart.base.AttrChangeConfig; @@ -20,23 +22,16 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; -import javax.swing.BorderFactory; -import javax.swing.BoxLayout; import javax.swing.JPanel; import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -45,18 +40,16 @@ import java.awt.event.MouseListener; import java.util.ArrayList; import java.util.List; +import static com.fine.theme.utils.FineUIScale.scale; +import static com.fr.design.i18n.Toolkit.i18nText; + /** * 图表切换设置面板 */ public class ChangeConfigPane extends BasicBeanPane { - private static final int WIDTH = 100; - private static final int EDIT_AREA_WIDTH = 180; - private static final int LABEL_WIDTH = 20; + private static final int WIDTH = scale(100); private static final int MIN_TIME = 0; private static final int MAX_TIME = Integer.MAX_VALUE; - private static final int CONSTANT_TEN = 10; - private static final int CONSTANT_THIRTY = 30; - private static final int CONSTANT_ZERO = 0; private static final int COL_COUNT = 4; private JPanel contentPane; //配置方式按钮 @@ -80,10 +73,10 @@ public class ChangeConfigPane extends BasicBeanPane { private List changeChartButtons = new ArrayList<>(); private int selectedChart; // 设置面板里面选取的图表，不是真正切换的图表 - public ChangeConfigPane(){ + public ChangeConfigPane() { init(); this.setLayout(new BorderLayout()); - this.setBorder(BorderFactory.createEmptyBorder(10, 15, 10, 15)); + this.setBorder(new ScaledEmptyBorder(10, 10, 10, 10)); this.add(createScrollPane(), BorderLayout.CENTER); } @@ -100,20 +93,15 @@ public class ChangeConfigPane extends BasicBeanPane { initButtonGroup(); configPane = createConfigPane(); contentPane = createContentPane(); - contentPane.setBorder(BorderFactory.createEmptyBorder(CONSTANT_TEN, CONSTANT_THIRTY, CONSTANT_TEN, CONSTANT_THIRTY)); } private JPanel createContentPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Change_Style")),configStyleButton}, + new Component[]{new UILabel(i18nText("Fine-Design_Chart_Change_Style")), configStyleButton}, new Component[]{configPane, null}, new Component[]{createButtonContentPane(), null} }; - return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); } private JPanel createConfigPane() { @@ -121,12 +109,12 @@ public class ChangeConfigPane extends BasicBeanPane { buttonConfigPane = createButtonConfigPane(); carouselConfigPane = createCarouseConfigPane(); - JPanel panel = new JPanel(new CardLayout()){ + JPanel panel = new JPanel(new CardLayout()) { @Override public Dimension getPreferredSize() { - if (configStyleButton.getSelectedIndex() == 0){ + if (configStyleButton.getSelectedIndex() == 0) { return buttonConfigPane.getPreferredSize(); - } else{ + } else { return carouselConfigPane.getPreferredSize(); } } @@ -135,39 +123,29 @@ public class ChangeConfigPane extends BasicBeanPane { panel.add(buttonConfigPane, "button"); panel.add(carouselConfigPane, "carousel"); - panel.setBorder(BorderFactory.createEmptyBorder(CONSTANT_ZERO, CONSTANT_TEN, CONSTANT_ZERO, CONSTANT_ZERO)); - return panel; } private JPanel createCarouseConfigPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f, p}; - double[] rowSize = {p, p, p}; timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0); colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH); - switchStyleGroup = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Show"), Toolkit.i18nText("Fine-Design_Report_Hide")}); + switchStyleGroup = new UIButtonGroup(new String[]{i18nText("Fine-Design_Chart_Show"), i18nText("Fine-Design_Report_Hide")}); + JPanel timeIntervalPane = FineLayoutBuilder.createHorizontalLayout(5, timeInterval, new UILabel(i18nText("Fine-Design_Chart_Time_Second"))); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup, null}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(Toolkit.i18nText("Fine-Design_Chart_Time_Second"))}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Background")),colorSelectBox4carousel, null} + new Component[]{new UILabel(i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup}, + new Component[]{new UILabel(i18nText("Fine-Design_Chart_Time_Interval")), timeIntervalPane}, + new Component[]{new UILabel(i18nText("Fine-Design_Basic_Background")), colorSelectBox4carousel} }; - return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); + return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); } private JPanel createTitleStylePane() { - final UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT); + final UILabel text = new UILabel(i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT); styleAttrPane = new ChartTextAttrPane() { protected JPanel getContentPane(JPanel buttonPane) { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {f, EDIT_AREA_WIDTH}; - double[] rowSize = {p, p}; - - return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), rowSize, columnSize); + return FineLayoutBuilder.compatibleTableLayout(10, getComponents(buttonPane), new double[]{1.2, 3}); } protected Component[][] getComponents(JPanel buttonPane) { @@ -181,56 +159,46 @@ public class ChangeConfigPane extends BasicBeanPane { } - private JPanel createButtonBackgroundColorPane(){ + private JPanel createButtonBackgroundColorPane() { colorSelectBox4button = new ColorSelectBoxWithOutTransparent(WIDTH); - return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Basic_Background"), colorSelectBox4button, EDIT_AREA_WIDTH); + return FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, + new UILabel(i18nText("Fine-Design_Basic_Background")), + colorSelectBox4button); } private JPanel createButtonContentPane() { - JPanel buttonContentPane = new JPanel(new BorderLayout()); + JPanel buttonContentPane = new JPanel(new BorderLayout(0, scale(10))); chartTypesPane = new JPanel(); - chartTypesPane.setLayout(new BoxLayout(chartTypesPane, BoxLayout.Y_AXIS)); - chartTypesPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); + chartTypesPane.setLayout(new BorderLayout()); switchTitlePane.setLayout(new CardLayout()); - JPanel titleEditPane = TableLayout4VanChartHelper.createGapTableLayoutPane( - Toolkit.i18nText("Fine-Design_Chart_Switch_Title_Label"), - switchTitlePane, - EDIT_AREA_WIDTH + JPanel titleEditPane = FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, + new UILabel(i18nText("Fine-Design_Chart_Switch_Title_Label")), + switchTitlePane ); - titleEditPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); buttonContentPane.add(chartTypesPane, BorderLayout.NORTH); buttonContentPane.add(titleEditPane, BorderLayout.CENTER); - UIExpandablePane expandablePane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Button_And_Rotation_Content"), 20, buttonContentPane) { - protected void setcontentPanelontentPanelBorder() { - - } - }; - expandablePane.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0)); - return expandablePane; + return new UIExpandablePane(i18nText("Fine-Design_Chart_Button_And_Rotation_Content"), buttonContentPane); } private void populateButtonContentPane(ChartCollection collection) { int count = collection.getChartCount(); int select = collection.getSelectedIndex(); - JPanel pane = null; + chartTypesPane.removeAll(); + ArrayList buttons = new ArrayList<>(); for (int i = 0; i < count; i++) { - if (i % COL_COUNT == 0) { - pane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - chartTypesPane.add(pane); - } - ChangeChartButton button = new ChangeChartButton(i, collection); changeChartButtons.add(button); button.setSelected(i == select); - pane.add(button); + buttons.add(button); populateSwitchTitlePane(i, collection); } + chartTypesPane.add(FineLayoutBuilder.createCommonTableLayout(COL_COUNT, 10, 10, buttons)); showSwitchTitleCard(collection.getChartName(select)); chartTypesPane.revalidate(); @@ -257,22 +225,17 @@ public class ChangeConfigPane extends BasicBeanPane { } private JPanel createButtonConfigPane() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p, f}; - double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ new Component[]{createTitleStylePane(), null}, new Component[]{createButtonBackgroundColorPane(), null}, }; - return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); } private void initButtonGroup() { - configStyleButton = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Button_Style"), - Toolkit.i18nText("Fine-Design_Chart_Carousel_Style")}); - configStyleButton.setPreferredSize(new Dimension(WIDTH * 2, (int) configStyleButton.getPreferredSize().getHeight())); + configStyleButton = new UIButtonGroup(new String[]{i18nText("Fine-Design_Chart_Button_Style"), + i18nText("Fine-Design_Chart_Carousel_Style")}); configStyleButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -292,11 +255,11 @@ public class ChangeConfigPane extends BasicBeanPane { @Override public void populateBean(ChartCollection ob) { - if (ob == null){ + if (ob == null) { return; } AttrChangeConfig changeConfigAttr = ob.getChangeConfigAttr(); - if (changeConfigAttr == null){ + if (changeConfigAttr == null) { return; } configStyleButton.setSelectedIndex(changeConfigAttr.getChangeType() == AttrChangeType.BUTTON ? 0 : 1); @@ -321,11 +284,11 @@ public class ChangeConfigPane extends BasicBeanPane { } public void updateBean(ChartCollection ob) { - if (ob == null){ + if (ob == null) { return; } AttrChangeConfig changeConfigAttr = ob.getChangeConfigAttr(); - if (changeConfigAttr == null){ + if (changeConfigAttr == null) { return; } changeConfigAttr.setChangeType(configStyleButton.getSelectedIndex() == 0 ? AttrChangeType.BUTTON : AttrChangeType.CAROUSEL); @@ -354,12 +317,10 @@ public class ChangeConfigPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Toolkit.i18nText("Fine-Design_Chart_Change_Config_Attributes"); + return i18nText("Fine-Design_Chart_Change_Config_Attributes"); } private class ChangeChartButton extends UIToggleButton { - private static final int BUTTON_WIDTH = 52; - private static final int BUTTON_HEIGHT = 20; private ChartCollection collection; private int buttonIndex; @@ -383,9 +344,6 @@ public class ChangeConfigPane extends BasicBeanPane { }; } - public Dimension getPreferredSize() { - return new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT); - } } private void resetChangeChartButtons() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java index 8b1c293282..57ad71a50d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java @@ -1,5 +1,9 @@ package com.fr.design.mainframe.chart.gui; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIConstants; +import com.fine.theme.utils.FineUIStyle; import com.fr.base.BaseUtils; import com.fr.chart.base.AttrChangeConfig; import com.fr.chart.chartattr.ChartCollection; @@ -24,15 +28,12 @@ import com.fr.plugin.chart.vanchart.VanChart; import com.fr.stable.StringUtils; import com.fr.van.chart.config.DefaultStyleHelper4Van; -import javax.swing.BorderFactory; -import javax.swing.BoxLayout; import javax.swing.JPanel; import javax.swing.SwingUtilities; import java.awt.BorderLayout; +import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Graphics; -import java.awt.GridLayout; import java.awt.Image; import java.awt.Rectangle; import java.awt.event.ActionEvent; @@ -46,7 +47,15 @@ import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; /** * 图表 类型 增删 控制按钮界面. @@ -56,11 +65,7 @@ import java.util.Set; */ public class ChartTypeButtonPane extends BasicBeanPane implements UIObserver { private static final long serialVersionUID = -8130803225718028933L; - private static final int B_W = 52; - private static final int B_H = 20; private static final int COL_COUNT = 4; - private static final int P_W = 300; - private static final int P_H = 400; private static Set> supportChangeConfigChartClassSet = new HashSet>(); @@ -103,38 +108,32 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen this.setLayout(new BorderLayout()); initButton(); - buttonPane = new JPanel(); - this.add(buttonPane, BorderLayout.CENTER); - - JPanel northPane = new JPanel(); - this.add(northPane, BorderLayout.NORTH); - - northPane.setLayout(new BorderLayout()); - northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5)); - - JPanel button = new JPanel(); - button.setPreferredSize(new Dimension(89, 20)); - button.setLayout(new GridLayout(1, 4, 3, 0)); - button.add(addButton); - button.add(copyButton); - button.add(moveForwardButton); - button.add(moveBackButton); - northPane.add(button, BorderLayout.WEST); - northPane.add(configButton, BorderLayout.EAST); + buttonPane = new JPanel(new BorderLayout()); + this.add(column(10, + row(5, + cell(addButton).weight(0.5), + cell(copyButton).weight(0.5), + cell(moveForwardButton).weight(0.5), + cell(moveBackButton).weight(0.5), + flex(2), + cell(configButton).weight(0.5) + ), + cell(buttonPane) + ).getComponent() + ); initConfigCreator(); - // Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK); } private void initButton() { - addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); - configButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/config.png")); - copyButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png")); + addButton = new UIButton(new LazyIcon("add")); + configButton = new UIButton(new LazyIcon("tool_config")); + copyButton = new UIButton(new LazyIcon("tool_copy")); copyButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); - moveForwardButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/left.png")); + moveForwardButton = new UIButton(new LazyIcon("move_left")); moveForwardButton.setToolTipText(Toolkit.i18nText("Fine-Design_Report_HF_Move_Left")); - moveBackButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/right.png")); + moveBackButton = new UIButton(new LazyIcon("move_right")); moveBackButton.setToolTipText(Toolkit.i18nText("Fine-Design_Report_HF_Move_Right")); initAddButton(); initConfigButton(); @@ -151,7 +150,6 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void initAddButton() { - addButton.setPreferredSize(new Dimension(20, 20)); addButton.addActionListener((e) -> { String name = getNewChartName(); ChartProvider chart = getChangeStateNewChart(); @@ -168,12 +166,10 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void initConfigButton() { - configButton.setPreferredSize(new Dimension(20, 20)); configButton.addActionListener((e) -> showConfigDialog()); } private void initCopyButton() { - copyButton.setPreferredSize(new Dimension(20, 20)); copyButton.addActionListener((e) -> { String name = getCopyChartName(); ChartProvider chart = getCopyChart(); @@ -182,8 +178,6 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void initMoveButton() { - moveForwardButton.setPreferredSize(new Dimension(20, 20)); - moveBackButton.setPreferredSize(new Dimension(20, 20)); moveForwardButton.addActionListener((e) -> moveForwardChart()); moveBackButton.addActionListener((e) -> moveBackChart()); } @@ -231,7 +225,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } }); - dialog.setSize(P_W, P_H); + dialog.setSize(FineUIConstants.Dialog.POP_DIALOG_MEDIUM); dialog.setVisible(true); } @@ -335,18 +329,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen return; } northPane.removeAll(); - northPane.setLayout(new BoxLayout(northPane, BoxLayout.Y_AXIS)); - - JPanel pane = null; - for (int i = 0; i < indexList.size(); i++) { - if (i % COL_COUNT == 0) { - pane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - northPane.add(pane); - } - - pane.add(indexList.get(i)); - } - + northPane.add(FineLayoutBuilder.createCommonTableLayout(COL_COUNT, 10, 10, indexList)); this.revalidate(); } @@ -355,22 +338,12 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen return; } northPane.removeAll(); - northPane.setLayout(new BoxLayout(northPane, BoxLayout.Y_AXIS)); - - JPanel pane = null; - - for (int i = 0; i < indexList.size(); i++) { - if (i % COL_COUNT == 0) { - pane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - northPane.add(pane); - } - if (i != index) { - pane.add(indexList.get(i)); - } else { - pane.add(currentEditingEditor); - } - } + List components = IntStream.range(0, indexList.size()) + .mapToObj(i -> i == index ? currentEditingEditor : indexList.get(i)) + .collect(Collectors.toList()); + northPane.add(FineLayoutBuilder.createCommonTableLayout(COL_COUNT, 10, 10, components)); this.revalidate(); + } /** @@ -518,6 +491,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } } }); + FineUIStyle.setStyle(this, FineUIStyle.COMPACT_BUTTON); } public String getButtonName() { @@ -530,10 +504,6 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen buttonName = name; } - public Dimension getPreferredSize() { - return new Dimension(B_W, B_H); - } - private void paintDeleteButton(Graphics g2d) { Rectangle2D bounds = this.getBounds(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java index bd94ff561a..8505b81e93 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.chart.gui; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.charttypes.ChartTypeManager; import com.fr.chartx.attr.ChartProvider; @@ -58,8 +60,8 @@ public class ChartTypePane extends AbstractChartAttrPane { @Override protected JPanel createContentPane() { initButtonListener(); - JPanel content = new JPanel(new BorderLayout()); - + JPanel content = new JPanel(new BorderLayout(0, FineUIScale.scale(10))); + content.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); buttonPane = new ChartTypeButtonPane(this); buttonPane.refreshChartInForm(inForm); content.add(buttonPane, BorderLayout.NORTH); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java index c24a192441..d4b98adb5e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.chart.gui.data; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.Utils; import com.fr.base.chart.chartdata.TopDefinitionProvider; import com.fr.chart.chartattr.ChartCollection; @@ -10,23 +12,20 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.style.AbstractChartTabPane; import com.fr.design.mainframe.chart.gui.style.ThirdTabPane; import com.fr.stable.StringUtils; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; -import javax.swing.BorderFactory; import javax.swing.JPanel; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.util.ArrayList; import java.util.List; import java.awt.BorderLayout; -import java.awt.Component; import java.awt.Dimension; -import java.awt.FlowLayout; + +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; /** * 图表数据 分类 系列 过滤界面. @@ -57,20 +56,15 @@ public class ChartDataFilterPane extends ThirdTabPane { protected void initTabPane() { super.initTabPane(); - tabPane.setPreferredSize(new Dimension(221, 25)); } protected void initLayout() { this.setLayout(new BorderLayout()); if (!paneList.isEmpty()) { - JPanel pane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0)); if (nameArray.length > 1) { - pane.add(tabPane); - this.add(pane, BorderLayout.NORTH); - centerPane.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); + this.add(tabPane, BorderLayout.NORTH); } - centerPane.setBorder(null); } this.add(centerPane, BorderLayout.CENTER); } @@ -129,8 +123,6 @@ public class ChartDataFilterPane extends ThirdTabPane { this.removeAll(); paneList = initPaneList4NoPresent(plot4Pane, parentPane); initAllPane(); - tabPane.setPreferredSize(new Dimension(221, 25)); - centerPane.setPreferredSize(new Dimension(getContentPaneWidth(), 200)); this.validate(); } @@ -213,19 +205,10 @@ public class ChartDataFilterPane extends ThirdTabPane { protected void layoutContentPane() { super.layoutContentPane(); - leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); } public void reloaPane(JPanel pane){ super.reloaPane(pane); - leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); - } - - @Override - public Dimension getPreferredSize() { - Dimension dim = super.getPreferredSize(); - dim.height = FIL_HEIGHT; - return dim; } @Override @@ -238,51 +221,37 @@ public class ChartDataFilterPane extends ThirdTabPane { protected JPanel initOtherPane() { onlyPreData = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Only_Use_Before_Records")); - JPanel panel1 = new JPanel(new BorderLayout()); - JPanel panel2 = new JPanel(new BorderLayout()); - panel1.add(onlyPreData, BorderLayout.NORTH); preDataNum = new UITextField(); UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Records_Num")); combineOther = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther")); combineOther.setSelected(true); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p,f}; - double[] rowSize = {p, p}; - Component[][] components = new Component[][]{ - new Component[]{label,preDataNum}, - new Component[]{combineOther,null} - }; - - preDataNumPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); - preDataNumPane.setBorder(BorderFactory.createEmptyBorder(10,15,0,0)); //默认不显示 + preDataNumPane = column(10, + row(cell(label).weight(1.2), cell(preDataNum).weight(3)), + cell(combineOther) + ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 10, 0, 0))).getComponent(); preDataNumPane.setVisible(false); - panel1.add(preDataNumPane, BorderLayout.CENTER); notShowNull = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Cate")); - panel2.add(notShowNull, BorderLayout.NORTH); - onlyPreData.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent e) { - checkBoxUse(); - } - }); + onlyPreData.addChangeListener(e -> checkBoxUse()); present = new PresentComboBox() { protected void fireChange() { fire(); } }; - presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present); - panel2.add(presentPane, BorderLayout.SOUTH); - - double[] column = {f}; - double[] row = {p, p}; - Component[][] coms = new Component[][]{ - new Component[]{panel1}, - new Component[]{panel2} - }; - return TableLayout4VanChartHelper.createGapTableLayoutPane(coms, row,column); + presentPane = row( + cell( + new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Present")) + ).weight(1.2), cell(present).weight(3) + ).getComponent(); + + return column(10, + cell(onlyPreData), + cell(preDataNumPane), + cell(notShowNull), + cell(presentPane) + ).with(it -> it.setBorder(new ScaledEmptyBorder(10, 0, 0, 0))).getComponent(); } @@ -387,19 +356,17 @@ public class ChartDataFilterPane extends ThirdTabPane { @Override public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); - dim.height = FIL_HEIGHT; + dim.height = FineUIScale.scale(FIL_HEIGHT); return dim; } protected void layoutContentPane() { super.layoutContentPane(); - leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); } public void reloaPane(JPanel pane){ super.reloaPane(pane); - leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); } @Override @@ -413,51 +380,37 @@ public class ChartDataFilterPane extends ThirdTabPane { protected JPanel initOtherPane() { onlyPreData = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Only_Use_Before_Records")); - JPanel panel1 = new JPanel(new BorderLayout()); - JPanel panel2 = new JPanel(new BorderLayout()); - panel1.add(onlyPreData, BorderLayout.NORTH); preDataNum = new UITextField(); UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Records_Num")); combineOther = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_CombineOther")); combineOther.setSelected(true); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {p,f}; - double[] rowSize = {p, p}; - Component[][] components = new Component[][]{ - new Component[]{label,preDataNum}, - new Component[]{combineOther,null} - }; - - preDataNumPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); - preDataNumPane.setBorder(BorderFactory.createEmptyBorder(10,15,0,0)); //默认不显示 + preDataNumPane = column(10, + row(cell(label).weight(1.2), cell(preDataNum).weight(3)), + cell(combineOther) + ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 10, 0, 0))).getComponent(); preDataNumPane.setVisible(false); - panel1.add(preDataNumPane, BorderLayout.CENTER); notShowNull = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Series")); - panel2.add(notShowNull, BorderLayout.NORTH); - onlyPreData.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent e) { - checkBoxUse(); - } - }); + onlyPreData.addChangeListener(e -> checkBoxUse()); present = new PresentComboBox() { protected void fireChange() { fire(); } }; - presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Style_Present") ,present); - panel2.add(presentPane, BorderLayout.SOUTH); - - double[] column = {f}; - double[] row = {p, p}; - Component[][] coms = new Component[][]{ - new Component[]{panel1}, - new Component[]{panel2} - }; - return TableLayout4VanChartHelper.createGapTableLayoutPane(coms, row,column); + presentPane = row( + cell( + new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Present")) + ).weight(1.2), cell(present).weight(3) + ).getComponent(); + + return column(10, + cell(onlyPreData), + cell(preDataNumPane), + cell(notShowNull), + cell(presentPane) + ).with(it -> it.setBorder(new ScaledEmptyBorder(10, 0, 0, 0))).getComponent(); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java index 40983c56b5..e89a0eaaf9 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java @@ -1,28 +1,26 @@ package com.fr.design.mainframe.chart.gui.data; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; import com.fr.data.impl.NameTableData; -import com.fr.design.constants.LayoutConstants; -import com.fr.design.constants.UIConstants; import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.TableDataComboBox; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.utils.gui.UIComponentUtils; import com.fr.log.FineLoggerFactory; -import javax.swing.BorderFactory; -import javax.swing.JPanel; -import javax.swing.border.LineBorder; import java.awt.BorderLayout; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + public class DatabaseTableDataPane extends BasicPane{ private static final long serialVersionUID = 5316016202202932242L; private TableDataComboBox tableNameCombox; @@ -38,21 +36,16 @@ public class DatabaseTableDataPane extends BasicPane{ initTableCombox(); initReviewButton(); - this.setLayout(new BorderLayout(0,0)); - if (label != null) { - this.add(label, BorderLayout.WEST); - } - - JPanel pane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0)); - pane.add(tableNameCombox,BorderLayout.CENTER); - pane.add(reviewButton,BorderLayout.EAST); - - this.add(UIComponentUtils.wrapWithBorderLayoutPane(pane),BorderLayout.CENTER); + this.setLayout(new BorderLayout()); + this.add( + row( + cell(label).weight(1.2), cell(tableNameCombox).weight(2.4), flex(0.1), cell(reviewButton).weight(0.5) + ).getComponent(), BorderLayout.CENTER + ); setBorder(); } protected void setBorder () { - this.setBorder(BorderFactory.createEmptyBorder(0,24,0,15)); } /** * 返回选中的数据源. @@ -101,15 +94,14 @@ public class DatabaseTableDataPane extends BasicPane{ } private void initReviewButton() { - reviewButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/search.png")); - reviewButton.setBorder(new LineBorder(UIConstants.LINE_COLOR)); + reviewButton = new UIButton(new LazyIcon("search")); reviewButton.addMouseListener(new MouseAdapter() { @Override public void mouseReleased(MouseEvent e) { - TableDataWrapper tableDataWrappe = tableNameCombox.getSelectedItem(); - if ( tableDataWrappe != null) { + TableDataWrapper tableDataWrapper = tableNameCombox.getSelectedItem(); + if ( tableDataWrapper != null) { try { - tableDataWrappe.previewData(); + tableDataWrapper.previewData(); } catch (Exception e1) { FineLoggerFactory.getLogger().error(e1.getMessage(), e1); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index 9943c79631..6bf18a70eb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java @@ -1,25 +1,26 @@ package com.fr.design.mainframe.chart.gui.data; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.beans.FurtherBasicBeanPane; -import com.fr.design.chartx.data.DataLayoutHelper; -import com.fr.design.constants.LayoutConstants; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.mode.ChartEditContext; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.van.chart.designer.AbstractVanChartScrollPane; -import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fr.design.constants.LayoutConstants.LEFT_WEIGHT; +import static com.fr.design.constants.LayoutConstants.RIGHT_WEIGHT; + /** * 一般数据界面 * @author kunsnat E-mail:kunsnat@gmail.com @@ -62,19 +63,14 @@ public class NormalChartDataPane extends DataContentsPane { JPanel contentPane = new JPanel(new BorderLayout()); dataPane = new UIComboBoxPane() { protected void initLayout() { - this.setLayout(new BorderLayout(ChartEditContext.normalMode() ? LayoutConstants.HGAP_LARGE : 0,6)); + this.setLayout(new BorderLayout(0, FineUIScale.scale(10))); + setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); if (ChartEditContext.supportReportData()) { - JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0)); - northPane.add(jcb, BorderLayout.CENTER); - UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); - label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); - northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); - if (ChartEditContext.normalMode()) { - northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 8)); - } else { - northPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20)); - } - this.add(northPane, BorderLayout.NORTH); + UILabel dataSourceLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); + this.add(row( + cell(dataSourceLabel).weight(LEFT_WEIGHT), + cell(jcb).weight(RIGHT_WEIGHT) + ).getComponent(), BorderLayout.NORTH); } this.add(cardPane, BorderLayout.CENTER); @@ -95,7 +91,6 @@ public class NormalChartDataPane extends DataContentsPane { } }; contentPane.add(dataPane, BorderLayout.CENTER); - dataPane.setBorder(BorderFactory.createEmptyBorder(10 ,0, 0, 0)); return contentPane; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java index 82240bc6d2..52e2f32cbd 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.chart.gui.data; +import com.fine.swing.ui.layout.Column; +import com.fine.theme.utils.FineUIScale; import com.fr.base.TableData; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; @@ -9,25 +11,19 @@ import com.fr.data.impl.NameTableData; import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; -import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.design.utils.gui.UIComponentUtils; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; import java.awt.BorderLayout; -import java.awt.Dimension; public class TableDataPane extends FurtherBasicBeanPane{ private static final long serialVersionUID = 4740461028440155147L; - private static final int TOP = -5; - private static final int TABLE_DATA_LABEL_LINE_WRAP_WIDTH = 65; - private static final int TABLE_DATA_PANE_WIDTH = 246; private DatabaseTableDataPane tableDataPane; private AbstractTableDataContentPane dataContentPane; + protected Column centerPane; private ChartDataPane parent; @@ -37,14 +33,12 @@ public class TableDataPane extends FurtherBasicBeanPane{ public TableDataPane(ChartDataPane parent) { this.parent = parent; + setLayout(new BorderLayout(0, FineUIScale.scale(10))); initDataPane(); } private void initDataPane() { - UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data")); - UIComponentUtils.setLineWrap(label, TABLE_DATA_LABEL_LINE_WRAP_WIDTH); - UIComponentUtils.setPreferedWidth(label, ChartDataPane.LABEL_WIDTH); - + UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data")); tableDataPane = new DatabaseTableDataPane(label) { @Override protected void userEvent() { @@ -52,10 +46,10 @@ public class TableDataPane extends FurtherBasicBeanPane{ checkBoxUse(); } }; - - tableDataPane.setPreferredSize(new Dimension(TABLE_DATA_PANE_WIDTH , tableDataPane.getPreferredSize().height)); - this.setBorder(BorderFactory.createEmptyBorder(TOP,0,0,0)); - this.add(tableDataPane, BorderLayout.NORTH); + centerPane = new Column(); + centerPane.setSpacing(10); + centerPane.add(tableDataPane); + this.add(centerPane, BorderLayout.CENTER); } /** @@ -127,7 +121,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ } dataContentPane = contentPane; if(dataContentPane != null) { - add(dataContentPane, BorderLayout.CENTER); + centerPane.add(dataContentPane); } } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java index 1073f0e410..fcd013e058 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.chart.gui.data.report; +import com.fine.theme.utils.FineUIStyle; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseFormula; import com.fr.base.Utils; import com.fr.chart.chartattr.ChartCollection; @@ -53,7 +55,6 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane addNewCatePane()); } /** @@ -100,37 +86,29 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor } private TinyFormulaPane addNewCatePane() { - final TinyFormulaPane pane = initCategoryBox(StringUtils.EMPTY); - pane.setPreferredSize(new Dimension(100, 16)); - - pane.registerChangeListener(uiobListener); - - formualList.add(pane); + final TinyFormulaPane formulaPane = initCategoryBox(StringUtils.EMPTY); - final JPanel newButtonPane = new JPanel(); - newButtonPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0)); - newButtonPane.add(pane); - - UIButton delButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/close.png")); - newButtonPane.add(delButton); + formulaPane.registerChangeListener(uiobListener); + formualList.add(formulaPane); + UIButton delButton = new UIButton(new LazyIcon("close")); + JPanel newButtonPane = row( + cell(formulaPane).weight(3.7), flex(0.1), cell(delButton).weight(0.4) + ).with(it -> it.setBorder(new ScaledEmptyBorder(10, 0, 0, 0))).getComponent(); boxPane.add(newButtonPane); - delButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - boxPane.remove(newButtonPane); - formualList.remove(pane); - checkComponent(); - relayoutPane(); - } + delButton.addActionListener(e -> { + boxPane.remove(newButtonPane); + formualList.remove(formulaPane); + checkComponent(); + relayoutPane(); }); delButton.registerChangeListener(uiobListener); checkComponent(); relayoutPane(); - return pane; + return formulaPane; } private void checkAddButton() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java index fb315b84ed..944f7d2825 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java @@ -5,25 +5,27 @@ import com.fr.chart.chartattr.Bar2DPlot; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartdata.NormalReportDataDefinition; import com.fr.chart.chartdata.SeriesDefinition; +import com.fr.design.border.FineBorderFactory; +import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.stable.StringUtils; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; -import javax.swing.BorderFactory; -import javax.swing.JPanel; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import java.awt.BorderLayout; -import java.awt.Dimension; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + public class CategoryPlotReportDataContentPane extends AbstractReportDataContentPane { - protected static final int PRE_WIDTH = 210; protected TinyFormulaPane categoryName; protected ChartDataFilterPane filterPane; @@ -35,30 +37,24 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent public CategoryPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); categoryName = initCategoryBox(Toolkit.i18nText("Fine-Design_Chart_Category_Name")); - categoryName.setPreferredSize(new Dimension(236,30)); - categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,20)); - this.add(categoryName, "0,0,1,0"); + this.setLayout(new BorderLayout()); filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane); - panel.setBorder(getSidesBorder()); - filterPane.setBorder(getFilterPaneBorder()); - this.add(panel, "0,6,1,4"); } + this.add(column( + cell(categoryName), + fix(10).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder())), + cell(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane)) + ).getComponent()); + } protected TinyFormulaPane initCategoryBox(final String leftLabel) { TinyFormulaPane categoryName = new DefaultTinyFormulaPane() { @Override protected void initLayout() { - this.setLayout(new BorderLayout(4, 0)); - - if(StringUtils.isNotEmpty(leftLabel)) { - UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Category_Name")); - label1.setPreferredSize(new Dimension(75, 20)); - this.add(label1, BorderLayout.WEST); - } - - formulaTextField.setPreferredSize(new Dimension(100, 20)); - this.add(formulaTextField, BorderLayout.CENTER); - this.add(formulaTextFieldButton, BorderLayout.EAST); + UILabel label = new UILabel(leftLabel); + this.setLayout(new BorderLayout()); + this.add(row( + cell(label).weight(1.2), cell(formulaTextField).weight(2), flex(0.1), cell(formulaTextFieldButton).weight(0.4) + ).getComponent()); } public void okEvent() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java index 7432dfcce1..0f2e21a6a4 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java @@ -1,28 +1,25 @@ package com.fr.design.mainframe.chart.gui.data.table; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineLayoutBuilder; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.chart.chartdata.TopDefinitionProvider; import com.fr.chart.chartattr.Bar2DPlot; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartdata.NormalTableDataDefinition; +import com.fr.design.border.FineBorderFactory; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataHelper; -import com.fr.design.utils.gui.GUICoreUtils; -import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.JPanel; import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -30,6 +27,11 @@ import java.awt.event.ItemListener; import java.util.ArrayList; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 多分类轴 的数据集定义界面. * @@ -38,9 +40,6 @@ import java.util.List; */ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableDataContentPane implements UIObserver { private static final long serialVersionUID = -3305681053750642843L; - private static final int COMBOX_GAP = 8; - private static final int COMBOX_WIDTH = 95; - private static final int COMBOX_HEIGHT = 20; private JPanel boxPane; @@ -59,40 +58,37 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD public CategoryPlotMoreCateTableDataContentPane(ChartDataPane parent) { categoryCombox = new UIComboBox(); - categoryCombox.setPreferredSize(new Dimension(COMBOX_WIDTH,COMBOX_HEIGHT)); - - JPanel categoryPane = new JPanel(new BorderLayout(4, 0)); - categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category")); - categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT)); - - addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); - addButton.setPreferredSize(new Dimension(20, COMBOX_HEIGHT)); - - categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox, addButton, null, categoryLabel, null})); - - categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15)); + UILabel categoryLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category")); + addButton = new UIButton(new LazyIcon("add")); boxPane = new JPanel(); boxPane.setLayout(new BoxLayout(boxPane, BoxLayout.Y_AXIS)); - categoryPane.add(boxPane, BorderLayout.SOUTH); + JPanel categoryPane = column(10, + row( + cell(categoryLabel).weight(1.2), + cell(categoryCombox).weight(2.4), + flex(0.1), + cell(addButton).weight(0.5) + ), + cell(boxPane) + ).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder())).getComponent(); + this.setLayout(new BorderLayout()); - this.add(categoryPane, BorderLayout.NORTH); - this.add(getJSeparator()); seriesTypeComboxPane = new SeriesTypeUseComboxPane(parent, new Bar2DPlot()); - this.add(seriesTypeComboxPane, BorderLayout.SOUTH); + this.add(FineLayoutBuilder.createVerticalLayout(10, categoryPane, seriesTypeComboxPane)); addButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { if (boxList.size() < 2) { - addNewCombox(); + addNewComboBox(); relayoutPane(); } checkSeriseUse(categoryCombox.getSelectedItem() != null); + checkComponent(); } }); @@ -112,49 +108,39 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD addButton.setEnabled(hasUse); } - private UIComboBox addNewCombox() { - final JPanel buttonPane = new JPanel(); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 2)); - - final UIComboBox combox = new UIComboBox(); - combox.setPreferredSize(new Dimension(COMBOX_WIDTH, COMBOX_HEIGHT)); + private UIComboBox addNewComboBox() { + final UIComboBox comboBox = new UIComboBox(); int count = categoryCombox.getItemCount(); for (int i = 0; i < count; i++) { - combox.addItem(categoryCombox.getItemAt(i)); + comboBox.addItem(categoryCombox.getItemAt(i)); } - combox.registerChangeListener(uiobListener); - combox.addItemListener(new ItemListener() { - @Override - public void itemStateChanged(ItemEvent e) { - makeToolTipUse(combox); - } - }); + comboBox.registerChangeListener(uiobListener); + comboBox.addItemListener(e -> makeToolTipUse(comboBox)); + + comboBox.setSelectedItem(categoryCombox.getItemAt(0)); + makeToolTipUse(comboBox); - combox.setSelectedItem(categoryCombox.getItemAt(0)); - makeToolTipUse(combox); + UIButton delButton = new UIButton(new LazyIcon("close")); + JPanel buttonPane = row( + flex(1.2), cell(comboBox).weight(2.4), flex(0.1), cell(delButton).weight(0.5) + ).with(it -> it.setBorder(new ScaledEmptyBorder(0, 0, 10, 0))).getComponent(); - buttonPane.add(combox); - UIButton delButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/close.png")); - buttonPane.add(delButton); boxPane.add(buttonPane); - boxList.add(combox); + boxList.add(comboBox); checkComponent(); - delButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - boxPane.remove(buttonPane); - boxList.remove(combox); - checkComponent(); - relayoutPane(); - } + delButton.addActionListener(e -> { + boxPane.remove(buttonPane); + boxList.remove(comboBox); + checkComponent(); + relayoutPane(); }); delButton.registerChangeListener(uiobListener); - return combox; + return comboBox; } private void checkAddButton() { @@ -223,7 +209,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD NormalTableDataDefinition normal = (NormalTableDataDefinition) top; int size = normal.getMoreCateSize(); for (int i = 0; i < size; i++) { - UIComboBox box = addNewCombox(); + UIComboBox box = addNewComboBox(); box.setSelectedItem(normal.getMoreCateWithIndex(i)); } } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java index 7d12e3e52d..270f3ffa71 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java @@ -6,22 +6,21 @@ import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartdata.NormalTableDataDefinition; import com.fr.chart.chartdata.TopDefinition; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.design.i18n.Toolkit; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; +import java.awt.BorderLayout; import java.util.List; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 属性表, 矩形类的 数据集 数据界面. * @author kunsnat E-mail:kunsnat@gmail.com @@ -40,29 +39,24 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa public CategoryPlotTableDataContentPane(ChartDataPane parent) { categoryCombox = new UIComboBox(); - JPanel categoryPane = new JPanel(new BorderLayout(4,0)); - categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel label1 = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category")) ; - label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); - categoryCombox.setPreferredSize(new Dimension(100,20)); + UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category")) ; categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None")); - categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox,null,null,label1,null})); - categoryPane.setPreferredSize(new Dimension(246,30)); - categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15)); - this.setLayout(new BorderLayout()); - - this.add(categoryPane, BorderLayout.NORTH); - - this.add(getJSeparator()); seriesTypeComboxPane = new SeriesTypeUseComboxPane(parent, new Bar2DPlot()); - this.add(seriesTypeComboxPane, BorderLayout.SOUTH); - categoryCombox.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - checkSeriseUse(categoryCombox.getSelectedItem() != null); - makeToolTipUse(categoryCombox); - } + this.setLayout(new BorderLayout()); + + this.add(column(10, + row( + cell(label).weight(1.2), cell(categoryCombox).weight(3) + ), + cell(seriesTypeComboxPane) + ).getComponent() + ); + + categoryCombox.addItemListener(e -> { + checkSeriseUse(categoryCombox.getSelectedItem() != null); + makeToolTipUse(categoryCombox); }); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java index 9edb02d9f7..9224674924 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java @@ -1,9 +1,13 @@ package com.fr.design.mainframe.chart.gui.data.table; +import com.fine.swing.ui.layout.Column; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIScale; import com.fr.base.Utils; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.MeterPlot; import com.fr.chart.chartdata.MeterTableDefinition; +import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.icombobox.UIComboBox; @@ -12,19 +16,14 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.design.utils.gui.GUICoreUtils; import com.fr.extended.chart.StringFormula; import com.fr.extended.chart.UIComboBoxWithNone; import com.fr.general.GeneralUtils; import com.fr.stable.StringUtils; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; -import javax.swing.BorderFactory; -import javax.swing.BoxLayout; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.List; @@ -40,21 +39,16 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane private static final String METER_VALUE = Toolkit.i18nText("Fine-Design_Chart_Value_Pointer"); private static final String TARGET_VALUE = Toolkit.i18nText("Fine-Design_Chart_Target_Value"); - private static final int COMBOBOX_WIDTH = 115; - private static final int COMBOBOX_HEIGHT = 20; - - private static final int LABEL_WIDTH = 85; - private UIComboBox nameBox; private UIComboBox valueBox; private UIComboBox targetBox; private TinyFormulaPane custom; private ChartDataFilterPane filterPane; - private JPanel boxPane; + private Column boxPane; public MeterPlotTableDataContentPane(ChartDataPane parent) { - this.setLayout(new BorderLayout()); + this.setLayout(new BorderLayout(0, FineUIScale.scale(10))); nameBox = new UIComboBoxWithNone(); nameBox.setSelectedIndex(nameBox.getItemCount() -1); @@ -63,8 +57,8 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane custom = new DefaultTinyFormulaPane(); filterPane = new ChartDataFilterPane(new MeterPlot(), parent); - boxPane = new JPanel(); - boxPane.setLayout(new BoxLayout(boxPane, BoxLayout.Y_AXIS)); + boxPane = new Column(); + boxPane.setSpacing(10); JPanel namePane = createPaneWithLabel(Toolkit.i18nText(METER_NAME), getNameComponent()); boxPane.add(namePane); @@ -92,11 +86,7 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane } }); - JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), filterPane); - - filterPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15)); - boxPane.setBorder(BorderFactory.createEmptyBorder(7, 24, 7, 15)); - jPanel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 5)); + JPanel jPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), filterPane, true); this.add(getJSeparator(), BorderLayout.NORTH); this.add(boxPane, BorderLayout.CENTER); @@ -108,12 +98,8 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane } private JPanel createPaneWithLabel(String labelName, Component component) { - component.setPreferredSize(new Dimension(COMBOBOX_WIDTH, COMBOBOX_HEIGHT)); UILabel label = new BoldFontTextLabel(labelName); - label.setPreferredSize(new Dimension(LABEL_WIDTH, COMBOBOX_HEIGHT)); - JPanel paneWithLabel = GUICoreUtils.createBorderLayoutPane(new Component[]{component, null, null, label, null}); - paneWithLabel.setBorder(BorderFactory.createEmptyBorder(3, 0, 3, 0)); - return paneWithLabel; + return FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, label, component); } protected void refreshBoxListWithSelectTableData(List list) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java index 889e6f5302..f3d326f8dc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java @@ -6,17 +6,14 @@ import com.fr.chart.chartdata.OneValueCDDefinition; import com.fr.data.util.function.AbstractDataFunction; import com.fr.data.util.function.NoneFunction; import com.fr.design.beans.FurtherBasicBeanPane; +import com.fr.design.border.FineBorderFactory; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.CalculateComboBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.extended.chart.UIComboBoxWithNone; -import javax.swing.BorderFactory; import javax.swing.JPanel; import java.util.List; import java.awt.BorderLayout; @@ -25,6 +22,11 @@ import java.awt.Dimension; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 属性表 数据集 系列名使用 系列值 界面. * @@ -45,9 +47,6 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane it.setBorder(FineBorderFactory.createDefaultUnderlineBorder())) + ).getComponent(); this.setLayout(new BorderLayout()); this.add(centerPane, BorderLayout.CENTER); } private void initCenterPaneWithOutCaculateSummary() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {f}; - double[] rowSize = {p, p, p, p}; UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name")); - label1.setPreferredSize(getLabelDimension()); UILabel label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value")); - label2.setPreferredSize(getLabelDimension()); - UILabel label3 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method")); - label3.setPreferredSize(getLabelDimension()); - Component[][] components = getUseComponentWithOutSummary(label1, label2, label3); - - centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 4, 6); - centerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1)); + centerPane = column(10, + row( + cell(label1).weight(1), cell(seriesName).weight(2) + ), + row( + cell(label2).weight(1), cell(seriesValue).weight(2) + ), + fix(1).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder())) + ).getComponent(); this.setLayout(new BorderLayout()); this.add(centerPane, BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java index cf78e59ffb..2a78359109 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java @@ -1,30 +1,32 @@ package com.fr.design.mainframe.chart.gui.data.table; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.chart.chartdata.TopDefinitionProvider; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartdata.MoreNameCDDefinition; import com.fr.chart.chartdata.OneValueCDDefinition; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.constants.LayoutConstants; import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.design.utils.gui.GUICoreUtils; -import javax.swing.BorderFactory; import javax.swing.JPanel; import java.util.List; import java.awt.BorderLayout; import java.awt.CardLayout; -import java.awt.Component; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 属性表: 柱形, 饼图 数据集界面, "系列名使用"界面. * @@ -98,32 +100,21 @@ public class SeriesTypeUseComboxPane extends BasicBeanPane { } protected void initLayout() { - this.setLayout(new BorderLayout(4, LayoutConstants.VGAP_MEDIUM)); - JPanel northPane = new JPanel(new BorderLayout(4, 0)); - + this.setLayout(new BorderLayout()); //使用系列名/系列值选项面板 UILabel seriesLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From")); - seriesLabel.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); - JPanel borderLayoutPane = GUICoreUtils.createBorderLayoutPane(new Component[]{content, null, null, seriesLabel, null}); - northPane.add(borderLayoutPane); - northPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 0, 16)); - this.add(northPane, BorderLayout.NORTH); - - //系列名/系列值配置面板 - cardPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15)); - this.add(cardPane, BorderLayout.CENTER); //数据筛选 dataScreeningPane = new ChartDataFilterPane(this.initplot, parent); - JPanel panel = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 250, 24, dataScreeningPane); - panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15)); - dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); - this.add(panel, BorderLayout.SOUTH); - } - public Dimension getPreferredSize() { - Dimension preferredSize = super.getPreferredSize(); - return new Dimension(246, (int) preferredSize.getHeight()); + this.add(column( + row( + cell(seriesLabel).weight(1), cell(content).weight(2) + ), + fix(10), + cell(cardPane), + cell(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), dataScreeningPane)) + ).with(it -> it.setBorder(new ScaledEmptyBorder(10, 0, 0, 0))).getComponent()); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java index 63b259e7aa..89281390d0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java @@ -1,8 +1,8 @@ package com.fr.design.mainframe.chart.gui.style; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.base.FRContext; -import com.fr.base.Utils; import com.fr.chart.base.TextAttr; import com.fr.design.constants.LayoutConstants; import com.fr.design.dialog.BasicPane; @@ -18,7 +18,6 @@ import com.fr.design.utils.DesignUtils; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; import com.fr.general.GeneralUtils; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; import javax.swing.SwingConstants; @@ -193,8 +192,8 @@ public class ChartTextAttrPane extends BasicPane { protected void initState() { fontNameComboBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report()); fontSizeComboBox = new UIComboBox(getFontSizeComboBoxModel()); - bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png")); - italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png")); + bold = new UIToggleButton(new LazyIcon("bold")); + italic = new UIToggleButton(new LazyIcon("italic")); initFontColorState(); } @@ -217,11 +216,7 @@ public class ChartTextAttrPane extends BasicPane { } protected JPanel getContentPane(JPanel buttonPane) { - double f = TableLayout.FILL; - double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - double[] columnSize = {f, e}; - - return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), getRowSize(), columnSize); + return FineLayoutBuilder.compatibleTableLayout(10, getComponents(buttonPane), new double[]{1.2, 3}); } protected double[] getRowSize() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java index 345d57de8a..85362b1329 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.chart.gui.style; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIScale; import com.fr.chart.base.TextAttr; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; @@ -7,7 +9,6 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.van.chart.designer.TableLayout4VanChartHelper; -import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.SwingConstants; import java.awt.BorderLayout; @@ -33,20 +34,15 @@ public class ChartTextAttrPaneWithThemeStyle extends ChartTextAttrPane { } protected JPanel getContentPane(JPanel buttonPane) { - JPanel panel = new JPanel(new BorderLayout(0, 10)); + JPanel panel = new JPanel(new BorderLayout(0, FineUIScale.scale(10))); preButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Follow_Theme"), Toolkit.i18nText("Fine-Design_Chart_Custom")}); - double f = TableLayout.FILL; - double e = getEdithAreaWidth(); - double p = TableLayout.PREFERRED; - double[] columnSize = {f, e}; UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT); - JPanel preButtonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(new Component[][]{new Component[]{text, preButton}}, new double[]{p}, columnSize); - textFontPane = TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), getRowSize(), columnSize); + JPanel preButtonPane = FineLayoutBuilder.compatibleTableLayout(10, new Component[][]{new Component[]{text, preButton}}, new double[]{1.2, 3}); + textFontPane = FineLayoutBuilder.compatibleTableLayout(10, getComponents(buttonPane), new double[]{1.2, 3}); panel.add(preButtonPane, BorderLayout.CENTER); panel.add(textFontPane, BorderLayout.SOUTH); - panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); return panel; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ColorSelectBoxWithThemeStyle.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ColorSelectBoxWithThemeStyle.java index db59476792..412266358a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ColorSelectBoxWithThemeStyle.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ColorSelectBoxWithThemeStyle.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.chart.gui.style; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.chart.base.ColorWithThemeStyle; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButtonGroup; @@ -7,13 +8,10 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.design.style.color.ColorSelectBox; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; -import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -40,7 +38,7 @@ public class ColorSelectBoxWithThemeStyle extends BasicPane { private void initContent() { - UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color"), SwingConstants.LEFT); + UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")); Component[][] components = ChartEditContext.supportTheme() ? new Component[][]{ new Component[]{text, preButton}, new Component[]{null, colorSelectBox}, @@ -48,23 +46,17 @@ public class ColorSelectBoxWithThemeStyle extends BasicPane { new Component[]{text, colorSelectBox} }; - JPanel gapTableLayoutPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components); + JPanel gapTableLayoutPane = FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); this.setLayout(new BorderLayout()); this.add(gapTableLayoutPane, BorderLayout.CENTER); } private void initListener() { - preButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - checkPreButton(); - } - }); + preButton.addActionListener(e -> checkPreButton()); } private void checkPreButton() { colorSelectBox.setVisible(preButton.getSelectedIndex() == CUSTOM); - this.setPreferredSize(ChartEditContext.supportTheme() && preButton.getSelectedIndex() == CUSTOM ? new Dimension(0, 55) : new Dimension(0, 23)); } public String title4PopupWindow() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java index a58a889164..5afaded3f2 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java @@ -3,29 +3,18 @@ package com.fr.design.mainframe.chart.gui.style; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicScrollPane; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.ibutton.UIButtonGroup; import javax.swing.JPanel; -import javax.swing.border.Border; import java.util.List; import java.awt.BorderLayout; import java.awt.CardLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; public abstract class ThirdTabPane extends BasicBeanPane{ private static final long serialVersionUID = 2298609199400393886L; - private static final int MIN_TAB_HEIGHT = 25; protected UIButtonGroup tabPane; protected String[] nameArray; public JPanel centerPane; @@ -57,54 +46,18 @@ public abstract class ThirdTabPane extends BasicBeanPane{ if (!paneList.isEmpty()) { tabPane = new UIButtonGroup(nameArray); tabPane.setSelectedIndex(0); - int prefHeight = tabPane.getPreferredSize().height; - int prefWidth = tabPane.getPreferredSize().width + 20; // 暂且加一个偏移量 - int minWidth = 60 * nameArray.length; - tabPane.setPreferredSize( - new Dimension(prefWidth > minWidth ? prefWidth : minWidth, - prefHeight > MIN_TAB_HEIGHT ? prefHeight : MIN_TAB_HEIGHT)); - tabPane.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - cardLayout.show(centerPane, nameArray[tabPane.getSelectedIndex()]); - } - }); - - centerPane.setBorder(myBorder); + tabPane.addActionListener(e -> cardLayout.show(centerPane, nameArray[tabPane.getSelectedIndex()])); } } protected void initLayout() { this.setLayout(new BorderLayout()); if (!paneList.isEmpty()) { - JPanel pane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0)); - pane.add(tabPane); - this.add(pane, BorderLayout.NORTH); + this.add(tabPane, BorderLayout.NORTH); } this.add(centerPane, BorderLayout.CENTER); } - private Border myBorder = new Border() { - @Override - public void paintBorder(Component c, Graphics g, int x, int y, int width,int height) { - Graphics2D g2d = (Graphics2D)g; - g2d.setColor(UIConstants.LINE_COLOR); - g2d.drawLine(0, 0, 0, height); - g2d.drawLine(tabPane.getPreferredSize().width - 1, 0, width - 2, 0); - g2d.drawLine(0, height - 1, width - 2, height - 1); - } - - @Override - public boolean isBorderOpaque() { - return false; - } - - @Override - public Insets getBorderInsets(Component c) { - return new Insets(2, 2, 2, 2); - } - }; - /** * * @return 中间的内容面板的指定宽度 diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java index c0842ab15e..0789ef53d6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java @@ -18,7 +18,6 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.Constants; import com.fr.van.chart.designer.component.format.FormatPaneWithOutFont; -import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.JSeparator; import java.awt.BorderLayout; @@ -134,7 +133,6 @@ public class ChartCategoryPane extends ChartAxisUsePane{ @Override protected void layoutContentPane() { leftcontentPane = createContentPane(); - leftcontentPane.setBorder(BorderFactory.createMatteBorder(5, 10, 5, 0, original)); this.add(leftcontentPane); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java index e9b118df87..0ebc75d75e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java @@ -1,17 +1,20 @@ package com.fr.design.mainframe.chart.gui.style.series; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.chart.chartattr.Bar2DPlot; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import java.awt.BorderLayout; +import java.awt.Component; + /** * 属性表, 图表样式 - 系列 界面, 通过重载继承每个不同的方法, 得到内容的组合. * @author kunsnat E-mail:kunsnat@gmail.com @@ -37,10 +40,6 @@ public abstract class AbstractPlotSeriesPane extends BasicBeanPane{ } protected JPanel getContentPane(boolean custom) { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = {f}; - double[] rowSize = {p, p, p}; Component[][] components = new Component[3][1]; JPanel panel; @@ -51,7 +50,7 @@ public abstract class AbstractPlotSeriesPane extends BasicBeanPane{ components[1] = new Component[]{new JSeparator()}; } - panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + panel = FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{1}); JScrollPane scrollPane = new JScrollPane(); scrollPane.setViewportView(panel); @@ -68,9 +67,8 @@ public abstract class AbstractPlotSeriesPane extends BasicBeanPane{ components[2] = new Component[]{contentPane}; } - panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + panel = FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{1}); } - panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 15)); return panel; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java index 2ae7e502e1..7a8dc38e65 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.chart.gui.style.series; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.base.BaseFormula; import com.fr.chart.base.AreaColor; import com.fr.chart.base.ChartBaseUtils; @@ -15,7 +16,6 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ipoppane.PopupHider; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.color.ColorControlWindow; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; @@ -44,17 +44,20 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; +import static com.fine.theme.utils.FineUIScale.scale; + public class UIColorPickerPane extends BasicPane implements UIObserver { - private static final int MARGIN_TOP = 7; - private static final int MARGIN_LEFT = 5; - private static final int COLORGROUP_MARGIN_LEFT = 20; - private static final int OFF_HEIGHT = 6; - private static final int COLOR_REC_HEIGHT = 40; - private static final int COLOR_REC_WIDTH = 30; - protected static final int TEXTFIELD_HEIGHT = 20; - protected static final int TEXTFIELD_WIDTH = 130; - protected static final int UPCONTROLPANE_WIDTH = 230; + private static final int MARGIN_TOP = scale(7); + private static final int MARGIN_LEFT = scale(5); + private static final int COLORGROUP_MARGIN_LEFT = scale(20); + private static final int OFF_HEIGHT = scale(6); + private static final int COLOR_REC_HEIGHT = scale(40); + private static final int COLOR_REC_WIDTH = scale(30); + protected static final int TEXTFIELD_HEIGHT = scale(20); + protected static final int TEXTFIELD_WIDTH = scale(130); + protected static final int UPCONTROLPANE_WIDTH = scale(230); private static final int LAYOUR_DET = 6; + public static final double VALUE = 100; protected ArrayList textFieldList; @@ -128,11 +131,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { } protected JPanel getUpControlPane (Component[][] components) { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - double[] columnSize = {f, e}; - return TableLayoutHelper.createTableLayoutPane(components, getRowSIze (), columnSize); + return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); } @@ -202,19 +201,15 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { } }; - double p = TableLayout.PREFERRED; - double e = getEditAreaWidth(); - double d = getDescriptionWidth(); - double[] columnSize = {d, e}; - double[] rowSize = {p}; - Component[][] tmpComp = new Component[][]{new Component[]{new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), regionNumPane}}; + Component[][] tmpComp = new Component[][]{new Component[]{ + new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), regionNumPane}}; - stagePanel = TableLayout4VanChartHelper.createGapTableLayoutPane(tmpComp, rowSize, columnSize); + stagePanel = FineLayoutBuilder.compatibleTableLayout(0, tmpComp, new double[]{1.2, 3}); Component[][] components = new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Tick_And_Color")), designTypeButtonGroup}, }; - upControlPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); + upControlPane = FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{1.2, 3}); this.textGroup = new TextFieldGroupPane(); this.colorGroup = new ColorGroupPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java index e8ef8714da..5bbea51697 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.chart.gui.type; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ilable.UILabel; @@ -13,11 +15,12 @@ import java.awt.Graphics; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; +import static com.fine.theme.utils.FineUIScale.scale; + public class ChartImagePane extends ChartSelectDemoPane { private static final long serialVersionUID = -2785128245790568603L; - private static final int IMAGE_WIDTH = 58; + private static final int IMAGE_WIDTH = 56; private static final int IMAGE_HIGTH = 50; - private static final Color ENTER_COLOR = new Color(216, 242, 253); private boolean isDrawRightLine = false; public boolean isDoubleClicked = false; @@ -28,9 +31,9 @@ public class ChartImagePane extends ChartSelectDemoPane { addMouseListener(this); this.setToolTipText(tipName); - this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB)); + this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, FineUIUtils.getUIColor("chart.normalBorderColor", "chart.normalBorderColor"))); this.setBackground(UIConstants.TOOLBARUI_BACKGROUND); - this.setPreferredSize(new Dimension(IMAGE_WIDTH, IMAGE_HIGTH)); + this.setPreferredSize(getScaledDimension()); } public ChartImagePane(String fullIconPath, String tipName, boolean isDrawRightLine){ @@ -45,7 +48,7 @@ public class ChartImagePane extends ChartSelectDemoPane { super.paint(g); BufferedImage image1 = IOUtils.readImageWithCache(fullIconPath); - g.drawImage(image1, 0, 0, IMAGE_WIDTH, IMAGE_HIGTH, null); + g.drawImage(image1, 0, 0, scale(IMAGE_WIDTH), scale(IMAGE_HIGTH), null); } }; @@ -56,10 +59,14 @@ public class ChartImagePane extends ChartSelectDemoPane { this.setToolTipText(tipName); - this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB)); + this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, FineUIUtils.getUIColor("chart.normalBorderColor", "chart.normalBorderColor"))); this.setBackground(UIConstants.TOOLBARUI_BACKGROUND); - this.setPreferredSize(new Dimension(IMAGE_WIDTH, IMAGE_HIGTH)); + this.setPreferredSize(getScaledDimension()); + + } + private Dimension getScaledDimension() { + return scale(new Dimension(IMAGE_WIDTH, IMAGE_HIGTH)); } /** @@ -81,11 +88,11 @@ public class ChartImagePane extends ChartSelectDemoPane { */ public void checkBorder() { if (!isRollOver && !isPressing) { - this.setBorder(BorderFactory.createMatteBorder(0, 0, 0, isDrawRightLine ? 1 : 0, UIConstants.SELECT_TAB)); + this.setBorder(BorderFactory.createMatteBorder(1, 1, 1, isDrawRightLine ? 1 : 0, FineUIUtils.getUIColor("chart.normalBorderColor", "chart.normalBorderColor"))); } else if (isRollOver && !isPressing) { - this.setBorder(BorderFactory.createMatteBorder(2, 2, 2, 2, ENTER_COLOR)); + this.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, FineUIUtils.getUIColor("chart.hoverBorderColor", "chart.hoverBorderColor"))); } else { - this.setBorder(BorderFactory.createMatteBorder(2, 2, 2, 2, UIConstants.FLESH_BLUE)); + this.setBorder(BorderFactory.createMatteBorder(2, 2, 2, 2, FineUIUtils.getUIColor("chart.selectedBorderColor", "chart.selectedBorderColor"))); } } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartTabPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartTabPane.java index 495c0409ad..05b353ea07 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartTabPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartTabPane.java @@ -1,5 +1,7 @@ package com.fr.design.mainframe.chart.gui.type; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.chart.chartattr.Chart; import com.fr.design.dialog.MultiTabPane; import com.fr.design.gui.ibutton.UIToggleButton; @@ -7,8 +9,9 @@ import com.fr.design.mainframe.chart.gui.style.legend.AutoSelectedPane; import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Graphics; /** * Created by Mitisky on 16/3/9. @@ -21,9 +24,9 @@ public abstract class ChartTabPane extends MultiTabPane { @Override protected void initLayout() { JPanel tabPanel = new JPanel(new BorderLayout()); - tabPanel.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 10, getBackground())); tabPanel.add(tabPane, BorderLayout.CENTER); - this.setLayout(new BorderLayout(0, 4)); + this.setLayout(new BorderLayout(0, FineUIScale.scale(10))); + this.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); this.add(tabPanel, BorderLayout.NORTH); this.add(centerPane, BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java index 2ed319249a..240aff93db 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java @@ -1,12 +1,12 @@ package com.fr.design.module; +import com.fine.theme.icon.LazyIcon; import com.fr.base.ChartEmptyDataStyleConf; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; -import com.fr.general.IOUtils; import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; @@ -20,7 +20,7 @@ import java.awt.event.ActionEvent; public class ChartEmptyDataStyleAction extends UpdateAction { public ChartEmptyDataStyleAction() { - this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/EmptyChart.png")); + this.setSmallIcon(new LazyIcon("chartEmptyDataStyle")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Empty_Data")); } diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java index 72228e094d..1103d4b348 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java @@ -1,5 +1,9 @@ package com.fr.design.module; +import com.fine.theme.light.ui.FineRoundBorder; +import com.fine.theme.utils.FineUIScale; +import com.formdev.flatlaf.ui.FlatUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.BaseUtils; import com.fr.base.ChartEmptyDataStyleConf; import com.fr.base.Style; @@ -26,21 +30,24 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SwingWorker; import java.awt.BorderLayout; -import java.awt.Component; +import java.awt.Color; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.GridLayout; import java.awt.Image; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.fix; +import static com.fine.swing.ui.layout.Layouts.row; + /** * Created by mengao on 2017/11/23. */ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { - private static final int WIDTH = 150; - private static final int HEIGHT = 20; + private static final int WIDTH = 100; + private static final int HEIGHT = 26; private static final int FIVE = 5; private static final int TEN = 10; private static final int THIRTY = 30; @@ -75,9 +82,20 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { } private JPanel creatNorthPane() { + initEmptyData(); + initImageData(); + UILabel promptContent = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Tip_Content")); + imageContent = new UILabel(Toolkit.i18nText("Fine-Design_Report_Image")); + + return row(20, + row(10, cell(promptContent), cell(emptyData), fix(10), cell(imageContent), cell(imageData)) + ).getComponent(); + } + + private void initEmptyData() { emptyData = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Open"), Toolkit.i18nText("Fine-Design_Chart_Close")}); emptyData.setSelectedIndex(0); - emptyData.setPreferredSize(new Dimension(WIDTH, HEIGHT)); + emptyData.setPreferredSize(FineUIScale.scale(new Dimension(WIDTH, HEIGHT))); emptyData.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -85,10 +103,12 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { repaintPreviewPane(); } }); + } + private void initImageData() { imageData = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Mode_Auto"), Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")}); imageData.setSelectedIndex(0); - imageData.setPreferredSize(new Dimension(WIDTH, HEIGHT)); + imageData.setPreferredSize(FineUIScale.scale(new Dimension(WIDTH, HEIGHT))); imageData.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -97,30 +117,27 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { repaintPreviewPane(); } }); - - UILabel promptContent = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Tip_Content")); - imageContent = new UILabel(Toolkit.i18nText("Fine-Design_Report_Image")); - JPanel emptyPane = GUICoreUtils.createFlowPane(new Component[]{promptContent, emptyData}, FlowLayout.LEFT, TEN, 0); - JPanel imagePane = GUICoreUtils.createFlowPane(new Component[]{imageContent, imageData}, FlowLayout.LEFT, TEN, 0); - imagePane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0)); - JPanel northPane = GUICoreUtils.createFlowPane(new Component[]{emptyPane, imagePane}, FlowLayout.LEFT, 0, 0); - northPane.setBorder(BorderFactory.createEmptyBorder(0, FIVE, 0, 0)); - return northPane; } private JPanel creatCenterPane() { JPanel centerPane = new JPanel(FRGUIPaneFactory.createBorderLayout()); // preview pane - JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + JPanel previewContainerPane = new JPanel(new BorderLayout()); centerPane.add(previewContainerPane, BorderLayout.CENTER); - JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_Preview")); - previewOwnerPane.setLayout(new BorderLayout()); + UILabel label = new UILabel((Toolkit.i18nText("Fine-Design_Basic_Preview"))); + label.setBorder(new ScaledEmptyBorder(10, 0, 10, 0)); + centerPane.add(label, BorderLayout.NORTH); + + previewPane = new ImagePreviewPane(); + JScrollPane previewOwnerPane = new JScrollPane(previewPane); + previewOwnerPane.setBorder(new FineRoundBorder()); + previewOwnerPane.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); + previewOwnerPane.getViewport().setOpaque(false); + previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST); - previewPane = new ImagePreviewPane(); - previewOwnerPane.add(new JScrollPane(previewPane)); // init image file chooser. @@ -133,7 +150,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_L_Pane(); - selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY)); + selectFilePane.setBorder(BorderFactory.createEmptyBorder(0, FIVE, 0, THIRTY)); defaultRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Default")); adjustRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Image_Adjust")); diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java b/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java index e0112f1865..16959512bd 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java @@ -1,5 +1,6 @@ package com.fr.design.module; +import com.fine.theme.icon.LazyIcon; import com.fr.chart.web.ChartHyperPoplink; import com.fr.chart.web.ChartHyperRelateCellLink; import com.fr.chart.web.ChartHyperRelateFloatLink; diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java index 4cc8466fd4..7368ea951d 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java @@ -1,5 +1,6 @@ package com.fr.design.module; +import com.fine.theme.utils.FineUIScale; import com.fr.base.ChartColorMatching; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButtonGroup; @@ -25,6 +26,11 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 预定义的图表配色界面. @@ -42,6 +48,8 @@ public class ChartPreFillStylePane extends BasicBeanPane { private ColorAdjustPane colorAdjustPane; private FixedGradientBar colorGradient; + private final Integer COLOR_ADJUST_PANE_WIDTH = 240; + private final Integer COLOR_ADJUST_PANE_HEIGHT = 88; public ChartPreFillStylePane() { initComponents(); @@ -50,35 +58,31 @@ public class ChartPreFillStylePane extends BasicBeanPane { } private void initComponents() { - - JPanel customPane = new JPanel(FRGUIPaneFactory.createBorderLayout()); - groupButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Custom_Color"), Toolkit.i18nText("Fine-Design_Chart_Gradient_Color")}); groupButton.setSelectedIndex(0); - customPane.add(groupButton, BorderLayout.NORTH); - changeColorSetPane = new JPanel(cardLayout = new CardLayout()); - changeColorSetPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); changeColorSetPane.add(colorGradient = new FixedGradientBarNoTheme(4, 150), "gradient"); changeColorSetPane.add(colorAdjustPane = new ColorAdjustPane(), "acc"); cardLayout.show(changeColorSetPane, "acc"); - customPane.add(changeColorSetPane, BorderLayout.CENTER); - customPane.setPreferredSize(new Dimension(155, 300)); - colorGradient.setPreferredSize(new Dimension(155, 30)); colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE); colorGradient.getSelectColorPointBtnP2().setColorInner(FixedGradientBar.NEW_CHARACTER); - - double p = TableLayout.PREFERRED; - double[] columnSize = {p, p}; - double[] rowSize = {p, p, p}; - Component[][] components = new Component[][]{ - new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match")), null}, - new Component[]{null, customPane}, - }; + this.setLayout(new BorderLayout()); - this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BorderLayout.WEST); + + this.add(column( + 10, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match"))), + row( + cell(groupButton).weight(0.1), + flex(0.2) + ), + row( + cell(changeColorSetPane).with(it -> it.setPreferredSize(FineUIScale.scale(new Dimension(COLOR_ADJUST_PANE_WIDTH, COLOR_ADJUST_PANE_HEIGHT)))), + flex() + ) + ).getComponent()); } private void initListener() { diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java index 8cf5cb24cf..e3e6593390 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java @@ -1,8 +1,8 @@ package com.fr.design.module; import com.fanruan.ComponentUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.ChartPreStyleConfig; -import com.fr.base.svg.IconUtils; import com.fr.concurrent.NamedThreadFactory; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; @@ -16,10 +16,10 @@ import com.fr.transaction.WorkerFacade; import com.fr.van.chart.designer.component.VanChartFillStylePane; import javax.swing.KeyStroke; +import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.concurrent.ExecutorService; -import java.awt.event.ActionEvent; /** * 图表预定义样式Action. @@ -35,7 +35,7 @@ public class ChartPreStyleAction extends UpdateAction { this.setMenuKeySet(CHART_DEFAULT_STYLE); this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("com/fr/design/images/chart/ChartType"); + this.setSmallIcon(new LazyIcon("chartPreStyle")); this.generateAndSetSearchText(ChartPreStyleManagerPane.class.getName()); } diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java index 9cce2be7c3..cd9863fc7e 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java @@ -1,5 +1,6 @@ package com.fr.design.module; +import com.fine.theme.light.ui.FineRoundBorder; import com.fr.base.ChartColorMatching; import com.fr.chart.base.ChartUtils; import com.fr.chart.chartattr.Bar2DPlot; @@ -10,6 +11,7 @@ import com.fr.design.chart.gui.ChartComponent; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ilable.BoldFontTextLabel; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import javax.swing.JPanel; @@ -19,6 +21,9 @@ import java.awt.Container; import java.awt.Dimension; import java.awt.FlowLayout; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; + /** * 图表预定义风格界面, 服务器--图表风格. * @author kunsnat E-mail:kunsnat@gmail.com @@ -45,19 +50,23 @@ public class ChartPreStylePane extends BasicBeanPane { boxPane.add(pane, BorderLayout.SOUTH); boxPane.add(fillStylePane, BorderLayout.CENTER); - - this.add(boxPane, BorderLayout.CENTER); - ChartCollection cc = new ChartCollection(); demoPlot = new Bar2DPlot(); cc.addChart(new Chart(demoPlot)); chartComponent = new ChartComponent(); chartComponent.populate(cc); - chartComponent.setPreferredSize(new Dimension(400, 300)); chartComponent.setSupportEdit(false); - - this.add(chartComponent, BorderLayout.SOUTH); + + this.add(column( + 10, + cell(fillStylePane), + column( + 10, + cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))), + cell(chartComponent).weight(1).with(it -> it.setBorder(new FineRoundBorder())) + ).weight(1) + ).getComponent()); initListener(ChartPreStylePane.this); } diff --git a/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java b/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java index 65ad2594d0..cd383ca358 100644 --- a/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java +++ b/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java @@ -1,5 +1,6 @@ package com.fr.design.module; +import com.fr.base.svg.IconUtils; import com.fr.chart.web.ChartHyperPoplink; import com.fr.chart.web.ChartHyperRelateCellLink; import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPoplinkPane; diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java index 60e52f2425..fe89815835 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/AreaChartTypeUI.java @@ -52,6 +52,14 @@ public class AreaChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Area.png"; } + /** + * 新图标Id + * @return iconId + */ + public String getIconId() { + return "chart_area"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Area"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java index 16300178b5..83a4518796 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/BarChartTypeUI.java @@ -54,6 +54,14 @@ public class BarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Bar.png"; } + /** + * 新图标Id + * @return iconId + */ + public String getIconId() { + return "chart_bar"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Bar"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java index eedb93c259..abb1a72533 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/BubbleChartTypeUI.java @@ -33,6 +33,14 @@ public class BubbleChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/Chart_BubbleChart.png"; } + /** + * 新图标Id + * @return 气泡图Id + */ + public String getIconId() { + return "chart_bubble"; + } + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){ return new BubblePlotTableDataContentPane(parent); } diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java index 4597ec5098..07f2be4f11 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/ColumnChartTypeUI.java @@ -55,6 +55,14 @@ public class ColumnChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Column.png"; } + /** + * 新图标Id + * @return 柱形图Id + */ + public String getIconId() { + return "chart_column"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Column"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java index ce47e17760..38eb5cf656 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/CustomChartTypeUI.java @@ -51,6 +51,14 @@ public class CustomChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png"; } + /** + * 新图标Id + * @return 组合图Id + */ + public String getIconId() { + return "chart_combine"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Combine"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java index f75bbe3ba6..14d3620950 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/DonutChartTypeUI.java @@ -53,6 +53,14 @@ public class DonutChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Donut.png"; } + /** + * 新图标Id + * @return 圆环图Id + */ + public String getIconId() { + return "chart_donut"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Donut"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java index d6c850381c..833a3ee7ff 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/FunnelChartTypeUI.java @@ -50,6 +50,14 @@ public class FunnelChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Funnel.png"; } + /** + * 新图标Id + * @return 漏斗图Id + */ + public String getIconId() { + return "chart_funnel"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Funnel"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java index 9e0b8184ca..f7965c5c33 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/GanttChartTypeUI.java @@ -43,6 +43,14 @@ public class GanttChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Gantt.png"; } + /** + * 新图标Id + * @return 甘特图Id + */ + public String getIconId() { + return "chart_gantt"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Gantt"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java index 4967b864c4..f68f25837a 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/LineChartTypeUI.java @@ -52,6 +52,14 @@ public class LineChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Line.png"; } + /** + * 新图标Id + * @return iconId + */ + public String getIconId() { + return "chart_line"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Line"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java index da09ed48e5..ecd388e3b0 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/MapChartTypeUI.java @@ -48,6 +48,14 @@ public class MapChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/Chart-Map.png"; } + /** + * 新图标Id + * @return 地图Id + */ + public String getIconId() { + return "chart_map"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_SVG_MAP"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java index cafef9ea24..e65c4c1c49 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/MeterChartTypeUI.java @@ -45,6 +45,14 @@ public class MeterChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Meter.png"; } + /** + * 新图标Id + * @return 仪表盘Id + */ + public String getIconId() { + return "chart_meter"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Meter"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java index 3e82d26dc8..046172f691 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/PieChartTypeUI.java @@ -53,6 +53,14 @@ public class PieChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Pie.png"; } + /** + * 新图标Id + * @return iconId + */ + public String getIconId() { + return "chart_pie"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Pie"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java index e994bb5756..eed4aad766 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/RadarChartTypeUI.java @@ -51,6 +51,14 @@ public class RadarChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Radar.png"; } + /** + * 新图标Id + * @return 雷达图Id + */ + public String getIconId() { + return "chart_radar"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Radar"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java index 14917575de..9f47a021fb 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/StockChartTypeUI.java @@ -51,6 +51,14 @@ public class StockChartTypeUI extends AbstractIndependentChartUIWithAPILevel { return "com/fr/design/images/form/toolbar/ChartF-Stock.png"; } + /** + * 新图标Id + * @return 箱形图Id + */ + public String getIconId() { + return "chart_box"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_Stock"); diff --git a/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java b/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java index 9bf5b787d9..62b1ce4dde 100644 --- a/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/design/type/ui/XYScatterChartTypeUI.java @@ -53,6 +53,14 @@ public class XYScatterChartTypeUI extends AbstractIndependentChartUIWithAPILevel return "com/fr/design/images/form/toolbar/ChartF-XYScatter.png"; } + /** + * 新图标Id + * @return 散点图Id + */ + public String getIconId() { + return "chart_scatter"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_Type_XYScatter"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java index 4fe84a35e3..fb2ffe670a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java @@ -19,6 +19,11 @@ public class AreaIndependentVanChartInterface extends AbstractMultiCategoryVanCh return "com/fr/design/images/form/toolbar/area.png"; } + @Override + public String getIconId() { + return "chart_area"; + } + @Override public String getName() { return Toolkit.i18nText("Fine-Design_Chart_New_Area"); diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaSeriesPane.java index a006ce54f3..751175b09f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaSeriesPane.java @@ -1,13 +1,12 @@ package com.fr.van.chart.area; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.van.chart.column.VanChartCustomStackAndAxisConditionPane; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.VanChartBeautyPane; import com.fr.van.chart.designer.component.VanChartLineTypePane; import com.fr.van.chart.designer.component.VanChartLineTypePaneWithoutDashed; @@ -27,11 +26,6 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane { protected JPanel getContentInPlotType() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] row = {p, p, p, p, p, p, p}; - double[] col = {f}; - Component[][] components = new Component[][]{ new Component[]{createLineTypePane()}, new Component[]{createMarkerPane()}, @@ -42,7 +36,7 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane { new Component[]{createTrendLinePane()}, }; - contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col); + contentPane = FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{1}); return contentPane; } @@ -61,6 +55,6 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane { protected JPanel createMarkerPane() { markerPane = new VanChartMarkerPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Marker"), markerPane); + return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Marker"), markerPane, true); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java index 542be966c7..7c1e94d71c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java @@ -57,6 +57,11 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha return "com/fr/design/images/form/toolbar/bar.png"; } + @Override + public String getIconId() { + return "chart_bar"; + } + @Override public AbstractChartTypePane getPlotTypePane() { return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartBarPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java index 6e1d3d9712..30ae21bf92 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java @@ -49,6 +49,14 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart return "com/fr/design/images/form/toolbar/box.png"; } + /** + * 新图标Id + * @return 箱形图Id + */ + public String getIconId() { + return "chart_box"; + } + public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { return new BoxPlotTableDataContentPane(plot, parent); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java index cc344d4f43..790bf0a05f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java @@ -69,6 +69,11 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh return "com/fr/design/images/form/toolbar/bubble.png"; } + @Override + public String getIconId() { + return "chart_bubble"; + } + @Override public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot) { return new VanChartBubbleSeriesPane(parent, plot); diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java index 3e2898f324..396667b799 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java @@ -1,13 +1,16 @@ package com.fr.van.chart.bubble.data; +import com.fine.theme.utils.FineLayoutBuilder; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.chart.chartdata.TopDefinitionProvider; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.BubblePlot; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartdata.BubbleTableDefinition; +import com.fr.design.border.FineBorderFactory; +import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; @@ -15,18 +18,15 @@ import com.fr.general.ComparatorUtils; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; import java.util.List; public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataContentPane { - private static final Dimension PREFERRED_SIZE = new Dimension(100, 20); protected UIComboBox seriesName; protected UIComboBox xCombox; protected UIComboBox yCombox; @@ -40,21 +40,11 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon yCombox = new UIComboBox(); dataScreeningPane = new ChartDataFilterPane(new BubblePlot(), parent); - - seriesName.setPreferredSize(PREFERRED_SIZE); - xCombox.setPreferredSize(PREFERRED_SIZE); - yCombox.setPreferredSize(PREFERRED_SIZE); seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); initBubbleSize(); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - - double[] columnSize_north = {f, COMPONENT_WIDTH}; - double[] rowSize_north = {p, p, p, p}; - Component[][] components_north = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName}, new Component[]{new UILabel("x" ), xCombox}, @@ -62,15 +52,14 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), bubbleSize}, }; - JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north); - north.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15)); - JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),dataScreeningPane); - dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); - filterPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); + JPanel north = FineLayoutBuilder.compatibleTableLayout(10, components_north, new double[]{1.2, 3}); + north.setBorder(BorderFactory.createCompoundBorder( + FineBorderFactory.createDefaultUnderlineBorder(), new ScaledEmptyBorder(0, 0, 10, 0) + )); + JPanel filterPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),dataScreeningPane); this.setLayout(new BorderLayout()); - this.add(getJSeparator(), BorderLayout.NORTH); this.add(north, BorderLayout.CENTER); this.add(filterPane, BorderLayout.SOUTH); @@ -82,7 +71,6 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon protected void initBubbleSize() { bubbleSize = new UIComboBox(); - bubbleSize.setPreferredSize(new Dimension(100, 20)); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java index a542f100cb..57176c256c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java @@ -1,8 +1,10 @@ package com.fr.van.chart.column; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.base.background.ImageBackground; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; +import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.frpane.UINumberDragPaneWithPercent; import com.fr.design.gui.ibutton.UIButtonGroup; @@ -10,28 +12,19 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.chart.UISpinnerWithPx; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.design.utils.gui.UIComponentUtils; -import com.fr.design.widget.FRWidgetFactory; import com.fr.plugin.chart.base.AttrSeriesImageBackground; import com.fr.plugin.chart.column.VanChartColumnPlot; import com.fr.stable.Constants; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.VanChartBeautyPane; import com.fr.van.chart.designer.component.VanChartBeautyPaneWithGradientBar; import com.fr.van.chart.designer.component.border.VanChartBorderPane; import com.fr.van.chart.designer.component.border.VanChartBorderWithRadiusPane; import com.fr.van.chart.designer.style.series.VanChartAbstractPlotSeriesPane; -import javax.swing.BorderFactory; import javax.swing.JPanel; -import java.awt.BorderLayout; import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; /** * 新条形图系列界面 @@ -52,20 +45,13 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { } protected JPanel getContentInPlotType() { - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - double[] columnSize = {f}; - double[] rowSize = {p,p,p,p,p,p,p,p,p,p}; - Component[][] components = new Component[][]{ - new Component[]{createSeriesStylePane(new double[]{p,p}, new double[]{f,e})}, - new Component[]{createBorderPane()}, - new Component[]{createStackedAndAxisPane()}, - new Component[]{createTrendLinePane()}, - }; - - contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - + contentPane = FineLayoutBuilder.createVerticalLayout(0, + createSeriesStylePane(), + createBorderPane(), + createStackedAndAxisPane(), + createTrendLinePane() + ); + contentPane = FineLayoutBuilder.asBorderLayoutWrapped(contentPane); return contentPane; } @@ -74,55 +60,26 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { return new VanChartBorderWithRadiusPane(true); } - private JPanel createSeriesStylePane(double[] row, double[] col) { - isFixedWidth = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")}); + private JPanel createSeriesStylePane() { + isFixedWidth = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")}); columnWidth = new UISpinnerWithPx(0,1000,1,0); - columnWidth.setBorder(BorderFactory.createEmptyBorder(0, (int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); seriesGap = new UINumberDragPaneWithPercent(-100, 100); categoryGap = new UINumberDragPaneWithPercent(0, 100); - isFillWithImage = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")}); + isFillWithImage = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")}); imagePane = new ImageBackgroundQuickPane(false); - imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); - - JPanel panel1 = new JPanel(new BorderLayout()); - JPanel isFixedWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Fixed_Column_Width"),isFixedWidth); - isFixedWidthPane.setBorder(BorderFactory.createEmptyBorder(0,0,6,0)); - panel1.add(isFixedWidthPane, BorderLayout.NORTH); - panel1.add(columnWidth, BorderLayout.CENTER); - - Component[][] components2 = new Component[][]{ - new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Series")),seriesGap}, - new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Category")),categoryGap}, + Component[][] components = new Component[][]{ + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Fixed_Column_Width")), isFixedWidth}, + new Component[]{null, columnWidth}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Series")), seriesGap}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Category")), categoryGap}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image")), isFillWithImage}, + new Component[]{null, imagePane} }; - JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(components2, row, col); + JPanel borderPane = FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); - UILabel fillImageLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image")); - Component[][] components3 = new Component[][]{ - new Component[]{fillImageLabel, UIComponentUtils.wrapWithBorderLayoutPane(isFillWithImage)}, - }; - JPanel panel3 = TableLayout4VanChartHelper.createGapTableLayoutPane(components3, row, col); - - JPanel panel = new JPanel(new BorderLayout(0, 4)); - panel.add(panel1, BorderLayout.NORTH); - panel.add(panel2, BorderLayout.CENTER); - panel.add(panel3, BorderLayout.SOUTH); - - JPanel borderPane = new JPanel(new BorderLayout()); - borderPane.add(panel, BorderLayout.NORTH); - borderPane.add(imagePane, BorderLayout.CENTER); - isFixedWidth.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - checkColumnWidth(); - } - }); - isFillWithImage.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - checkImagePane(); - } - }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), borderPane); + isFixedWidth.addActionListener(e -> checkColumnWidth()); + isFillWithImage.addActionListener(e -> checkImagePane()); + return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image"), borderPane); } private void checkAll() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java index a971a98a9a..5e1bc93a8b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanColumnChartTypeUI.java @@ -48,6 +48,11 @@ public class VanColumnChartTypeUI extends AbstractMultiCategoryVanChartUI { return "com/fr/design/images/form/toolbar/column.png"; } + @Override + public String getIconId() { + return "chart_column"; + } + @Override public AbstractChartTypePane getPlotTypePane() { return ChartEditContext.duchampMode() ? new InvisibleChartTypePane() : new VanChartColumnPlotPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java index e16151a849..7cc4230498 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java @@ -20,6 +20,11 @@ public class CustomIndependentVanChartInterface extends AbstractIndependentVanCh return Toolkit.i18nText("Fine-Design_Chart_New_Combine"); } + @Override + public String getIconId() { + return "chart_combine"; + } + @Override public String[] getSubName() { return new String[]{ diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/MeterCustomPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/MeterCustomPlotTableDataContentPane.java index 6b00e9eb20..c23598e952 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/MeterCustomPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/MeterCustomPlotTableDataContentPane.java @@ -8,14 +8,11 @@ import com.fr.design.mainframe.chart.gui.data.table.MeterPlotTableDataContentPan import com.fr.plugin.chart.data.VanChartMeterCustomTableDefinition; import java.awt.Component; -import java.awt.Dimension; /** * Created by Fangjie on 2016/5/18. */ public class MeterCustomPlotTableDataContentPane extends MeterPlotTableDataContentPane { - private static final int TEXT_HT = 20; - private static final int TEXT_WD = 80; private UITextField nameField; public MeterCustomPlotTableDataContentPane(ChartDataPane parent) { super(parent); @@ -24,7 +21,6 @@ public class MeterCustomPlotTableDataContentPane extends MeterPlotTableDataConte @Override protected Component getNameComponent() { nameField = new UITextField(); - nameField.setPreferredSize(new Dimension(TEXT_WD, TEXT_HT)); return nameField; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotUITabGroup.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotUITabGroup.java index 1c9fe9f9f4..5e65a0e26c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotUITabGroup.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotUITabGroup.java @@ -2,16 +2,10 @@ package com.fr.van.chart.custom.component; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UITabGroup; -import com.fr.design.gui.ibutton.UIToggleButton; import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.JPanel; -import javax.swing.border.Border; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.LayoutManager; @@ -32,86 +26,12 @@ public class VanChartCustomPlotUITabGroup extends UITabGroup{ super(textArray); } - @Override protected LayoutManager getGridLayout(int number) { //这个地方可以顺便获取list个数 listNum = number; return new GridBagLayout(); } - @Override - protected void paintBorder(Graphics g) { - Border border = getBorder(); - if (border != null) { - border.paintBorder(this, g, 0, 0, getWidth(), getHeight()); - } - } - - @Override - protected Border getGroupBorder() { - return BorderFactory.createEmptyBorder(1, 1, 1, 1); - } - - @Override - protected void initButton(UIToggleButton labelButton) { - - int ButtonWidth = WIDTH / 3; - if (listNum <= 1){ - return; - }else if (listNum == 2){ - ButtonWidth = WIDTH / 2; - } - - //将button加入到pane中，以便可以对边框进行控制 - labelButton.setRoundBorder(false); - labelButton.setBorderPainted(false); - - - - labelButtonList.add(labelButton); - - int index = labelButtonList.size() - 1; - - JPanel panel = getButtonPanel(labelButton, index); - - GridBagConstraints constraints=new GridBagConstraints(); - - int end = listNum % 3; - - if (end == 1 && index == 0){ - constraints.gridy = 0; - constraints.gridx = 0; - constraints.gridheight = 1; - constraints.gridwidth = 6; - ButtonWidth = WIDTH + 2; - }else if (end == 2 && (index == 0 || index == 1) && listNum != 2){ - constraints.gridy = 0; - constraints.gridx = index == 1 ? 4 : 0; - constraints.gridheight = 1; - constraints.gridwidth = index == 0 ? 4 : 2; - ButtonWidth = index == 0 ? ButtonWidth * 2 + 1 : ButtonWidth; - }else { - int l = ((index + ((end == 0) ? end : (3 - end))) / 3); - constraints.gridy = l; - constraints.gridx = ((index - (l * 3 - (end == 0 ? end : 3 - end))))*2; - constraints.gridheight = 1; - constraints.gridwidth = 2; - } - labelButton.setPreferredSize(new Dimension(ButtonWidth, BUTTON_HEIGHT)); - - this.add(panel, constraints); - } - - private JPanel getButtonPanel(UIToggleButton labelButton, int index) { - JPanel panel = new JPanel(); - panel.setLayout(new BorderLayout()); - panel.add(labelButton,BorderLayout.CENTER); - - setPanelBorder(panel, index); - - return panel; - } - public void setPanelBorder(JPanel panel, int index) { int end = listNum % 3; int num = listNum; diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java index 5b17494da9..77b581bdd7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java @@ -1,5 +1,6 @@ package com.fr.van.chart.custom.component; +import com.fine.theme.utils.FineUIScale; import com.fr.base.BaseFormula; import com.fr.chart.chartattr.Plot; import com.fr.chart.web.ChartHyperPoplink; @@ -43,6 +44,7 @@ import com.fr.stable.Nameable; import com.fr.stable.bridge.StableFactory; import com.fr.van.chart.designer.component.VanChartUIListControlPane; +import java.awt.Dimension; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.lang.reflect.Constructor; @@ -59,6 +61,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { public VanChartHyperLinkPane() { super(); + setPreferredSize(FineUIScale.scale(new Dimension(224, 420))); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomPlotSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomPlotSeriesPane.java index 1951e0df63..19c102b867 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomPlotSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomPlotSeriesPane.java @@ -1,20 +1,17 @@ package com.fr.van.chart.custom.style; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.chart.chartattr.Plot; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.series.AbstractPlotSeriesPane; +import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Dimension; /** * Created by Fangjie on 2016/4/26. */ public class VanChartCustomPlotSeriesPane extends BasicBeanPane { - private static final int WIDTH = 236; - private static final int DELTA_HEIGHT = 300; private BasicBeanPane axisPane; private AbstractPlotSeriesPane seriesPane; public VanChartCustomPlotSeriesPane(BasicBeanPane axisPane, AbstractPlotSeriesPane seriesPane) { @@ -25,15 +22,7 @@ public class VanChartCustomPlotSeriesPane extends BasicBeanPane { } private void initContentPane() { - - seriesPane.setPreferredSize(new Dimension(WIDTH, (int) (seriesPane.getPreferredSize().getHeight() + DELTA_HEIGHT))); - - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - - double[] columnSize = {f}; - double[] rowSize = {p, p, p}; - + setLayout(new BorderLayout()); if (axisPane == null) { this.add(seriesPane); }else { @@ -41,7 +30,7 @@ public class VanChartCustomPlotSeriesPane extends BasicBeanPane { new Component[]{axisPane}, new Component[]{seriesPane} }; - this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize)); + this.add(FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{1})); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java index f5d592e025..9949862884 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/AbstractVanChartScrollPane.java @@ -14,23 +14,9 @@ public abstract class AbstractVanChartScrollPane extends BasicScrollPane { protected void layoutContentPane() { leftcontentPane = createContentPane(); - leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 5, 0, 10, original)); this.add(leftcontentPane); } - protected void setLeftContentPaneBounds(Container parent, UIScrollBar scrollBar, int beginY, int maxheight) { - int width = parent.getWidth(); - int height = parent.getHeight(); - if (leftcontentPane.getPreferredSize().height > maxheight) { - scrollBar.setBounds(width - scrollBar.getWidth() - 1, 0, 6, height); - leftcontentPane.setBounds(0, -beginY, width - 6, height + beginY); - leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 4, 0, 4, original)); - - } else { - leftcontentPane.setBounds(0, 0, width, height); - leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 4, 0, 10, original)); - } - } public void reloaPane(JPanel pane){ super.reloaPane(pane); leftcontentPane.setBorder(BorderFactory.createEmptyBorder()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/LineTypeComboBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/LineTypeComboBox.java index 395d615926..bb9c858760 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/LineTypeComboBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/LineTypeComboBox.java @@ -14,6 +14,8 @@ import java.awt.Dimension; import java.awt.Graphics; import java.awt.Graphics2D; +import static com.fine.theme.utils.FineUIScale.scale; + /** * Created by shine on 2019/08/30. */ @@ -47,10 +49,10 @@ public class LineTypeComboBox extends UIComboBox { switch (this.lineType) { case SOLID: - GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2); + GraphHelper.drawLine(g2d, scale(4), d.height / 2, d.width - scale(8), d.height / 2); break; case DASHED: - GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, Constants.LINE_DASH); + GraphHelper.drawLine(g2d, scale(4), d.height / 2, d.width - scale(8), d.height / 2, Constants.LINE_DASH); break; default: break; @@ -59,7 +61,7 @@ public class LineTypeComboBox extends UIComboBox { } public Dimension getPreferredSize() { - return new Dimension(60, 16); + return scale(new Dimension(60, 16)); } public Dimension getMinimumSize() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java index 0fefa406e0..d82b6409c7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java @@ -1,14 +1,13 @@ package com.fr.van.chart.designer.component; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.chart.base.GradientStyle; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; import com.fr.plugin.chart.type.GradientType; import com.fr.stable.StringUtils; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; import java.awt.BorderLayout; @@ -37,17 +36,11 @@ public class VanChartBeautyPane extends BasicBeanPane { gradientTypeBox = new UIButtonGroup(names); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - double[] columnSize = {f, e}; - double[] rowSize = {p}; - Component[][] components = new Component[][]{ new Component[]{new UILabel(labelName()), gradientTypeBox}, }; - return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); + return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); } protected String[] getNameArray() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java index 3f7374c34d..c1b3424d15 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java @@ -10,8 +10,6 @@ import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.design.mainframe.predefined.ui.detail.ColorFillStylePane; import com.fr.design.utils.gui.GUICoreUtils; -import javax.swing.BorderFactory; -import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; @@ -36,12 +34,6 @@ public class VanChartFillStylePane extends ColorFillStylePane implements Designe this.add(getContentPane(), BorderLayout.CENTER); } - protected JPanel getContentPane() { - JPanel contentPane = super.getContentPane(); - contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0)); - return contentPane; - } - protected Component[][] contentPaneComponents() { return new Component[][]{ new Component[]{null, null}, diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartGanttTimeLinePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartGanttTimeLinePane.java index 0af3a24b13..716435b2e7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartGanttTimeLinePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartGanttTimeLinePane.java @@ -1,17 +1,15 @@ package com.fr.van.chart.designer.component; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.chart.chartattr.Plot; import com.fr.design.gui.frpane.UINumberDragPaneWithPercent; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; import com.fr.plugin.chart.gantt.VanChartGanttPlot; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; -import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.BorderLayout; @@ -27,13 +25,12 @@ public class VanChartGanttTimeLinePane extends JPanel { public VanChartGanttTimeLinePane() { this.setLayout(new BorderLayout()); - this.add(createSwitchButtonPane(), BorderLayout.NORTH); - this.add(createCenterPane(), BorderLayout.CENTER); + this.add(FineLayoutBuilder.createVerticalLayout(10, + createSwitchButtonPane(), createCenterPane() + )); } private JPanel createSwitchButtonPane() { - double[] columnSize = {TableLayout.PREFERRED, TableLayout.FILL}; - double[] rowSize = {TableLayout.PREFERRED, TableLayout.PREFERRED}; String[] array = new String[]{Toolkit.i18nText("Fine-Design_Chart_Guide_Line_Not_Show"), Toolkit.i18nText("Fine-Design_Chart_Guide_Line_Show")}; switchButton = new UIButtonGroup<>(array); switchButton.addChangeListener(new ChangeListener() { @@ -42,25 +39,20 @@ public class VanChartGanttTimeLinePane extends JPanel { setCenterPaneVisibility(); } }); - UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Guide_Line_Current_Line"), SwingConstants.LEFT); - return TableLayout4VanChartHelper.createGapTableLayoutPane(new Component[][] { - new Component[]{null, null}, + UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Guide_Line_Current_Line")); + return FineLayoutBuilder.compatibleTableLayout(10, new Component[][] { new Component[] {text, switchButton} - }, rowSize, columnSize); + }, new double[]{1.2, 3}); } private JPanel createCenterPane() { - double[] columnSize = {TableLayout.FILL, TableLayout4VanChartHelper.EDIT_AREA_WIDTH}; - double[] rowSize = {TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED}; - colorSelect = new ColorSelectBoxWithOutTransparent(100); opacity = new UINumberDragPaneWithPercent(0, 100); - centerPane = TableLayout4VanChartHelper.createGapTableLayoutPane(new Component[][] { - new Component[]{null, null}, + centerPane = FineLayoutBuilder.compatibleTableLayout(10, new Component[][] { new Component[] {new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), colorSelect}, new Component[] {new UILabel(Toolkit.i18nText("Fine-Design_Report_Alpha")), opacity} - }, rowSize, columnSize); + }, new double[]{1.2, 3}); centerPane.setVisible(false); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHeatValueColorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHeatValueColorPane.java index dac55c81c1..527c50f3ae 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHeatValueColorPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHeatValueColorPane.java @@ -1,5 +1,6 @@ package com.fr.van.chart.designer.component; +import com.fine.theme.utils.FineUIScale; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.ilable.BoldFontTextLabel; @@ -50,7 +51,7 @@ public class VanChartHeatValueColorPane extends VanChartValueColorPane { @Override protected MapColorPickerPaneWithFormula createSectionIntervalConfigPane(AbstractAttrNoScrollPane parent) { return new SectionIntervalConfigPaneWithOutNum(parent) { - private static final int WIDTH = 227; + private final int WIDTH = FineUIScale.scale(227); @Override protected int getBoundX() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java index b6119aa642..20aada59a8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java @@ -1,27 +1,28 @@ package com.fr.van.chart.designer.component; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIScale; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.chart.UISpinnerWithPx; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.TableLayout; -import com.fr.design.utils.gui.UIComponentUtils; -import com.fr.design.widget.FRWidgetFactory; import com.fr.general.ComparatorUtils; import com.fr.plugin.chart.base.VanChartAttrLine; import com.fr.plugin.chart.type.LineStyle; import com.fr.plugin.chart.type.LineType; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; -import java.util.Arrays; import java.awt.BorderLayout; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; + /** * line相关设置 */ @@ -51,22 +52,14 @@ public class VanChartLineTypePane extends BasicPane { Toolkit.i18nText("Fine-Design_Chart_Open"), Toolkit.i18nText("Fine-Design_Chart_Close")}); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - Component[] lineStyleComponent = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Present")), lineStyle}, nullValueBreakComponent = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break")), nullValueBreak}; Component[][] components = createContentComponent(lineStyleComponent, nullValueBreakComponent); - double[] row = new double[components.length]; - Arrays.fill(row, p); - double[] col = {f, e}; - - lineStylePane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); + lineStylePane = FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.2, 3}); - this.setLayout(new BorderLayout(0, 6)); + this.setLayout(new BorderLayout(0, FineUIScale.scale(10))); this.add(typeAndWidthPane, BorderLayout.NORTH); this.add(lineStylePane, BorderLayout.CENTER); } @@ -84,29 +77,16 @@ public class VanChartLineTypePane extends BasicPane { checkLineStyle(); } }); - - Component[][] lineTypeComps = new Component[][]{ - new Component[]{null, null}, - new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")), lineTypeComboBox} - }; - Component[][] lineWidthComps = new Component[][]{ - new Component[]{ - FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Width")), - UIComponentUtils.wrapWithBorderLayoutPane(lineWidthSpinner)} - }; - - double p = TableLayout.PREFERRED, f = TableLayout.FILL, e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; - double[] col = {f, e}; - - JPanel lineTypePane = TableLayout4VanChartHelper.createGapTableLayoutPane(lineTypeComps, new double[]{p, p}, col); - lineWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(lineWidthComps, new double[]{p}, col); - - JPanel contentPane = new JPanel(new BorderLayout(0, 6)); - - contentPane.add(lineTypePane, BorderLayout.CENTER); - contentPane.add(lineWidthPane, BorderLayout.SOUTH); - - return contentPane; + lineWidthPane = row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Width"))).weight(1.2), cell(lineWidthSpinner).weight(3) + ).getComponent(); + + return column(10, + row( + cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style"))).weight(1.2), + cell(lineTypeComboBox).weight(3) + ), + cell(lineWidthPane)).getComponent(); } protected LineTypeComboBox createLineType() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java index 1f8b55cfbf..d087c7f026 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java @@ -1,6 +1,9 @@ package com.fr.van.chart.designer.component; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIScale; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButtonGroup; @@ -30,7 +33,7 @@ public class VanChartMarkerPane extends BasicPane { private BasicBeanPane imageMarkerPane; public VanChartMarkerPane() { - this.setLayout(new BorderLayout(0, 4)); + this.setLayout(new BorderLayout(0, FineUIScale.scale(10))); String[] array = new String[]{Toolkit.i18nText("Fine-Design_Chart_Rule"), Toolkit.i18nText("Fine-Design_Chart_Custom")}; commonORCustom = new UIButtonGroup(array, array); @@ -88,7 +91,9 @@ public class VanChartMarkerPane extends BasicPane { } protected void layoutComponents() { - this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Point_Style"), commonORCustom), BorderLayout.NORTH); + this.add(FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, + new UILabel(Toolkit.i18nText("Fine-Design_Chart_Point_Style")), commonORCustom + ), BorderLayout.NORTH); this.add(centerPane, BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java index d89a7d31e5..ce4a6492b5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java @@ -1,15 +1,16 @@ package com.fr.van.chart.designer.component; +import com.fine.theme.utils.FineLayoutBuilder; +import com.fine.theme.utils.FineUIScale; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.jxbrowser.JxUIPane; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.general.ComparatorUtils; @@ -22,7 +23,6 @@ import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat; import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat; import com.fr.plugin.chart.base.format.AttrTooltipValueFormat; import com.fr.stable.StringUtils; -import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox; @@ -52,6 +52,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.row; + /** * 数据点提示内容界面，含有通用设置、富文本编辑器、自定义JS界面 */ @@ -191,7 +195,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane(new String[]{ Toolkit.i18nText("Fine-Design_Chart_Common"), @@ -291,22 +289,18 @@ public class VanChartTooltipContentPane extends BasicBeanPane pane = new UIBubbleFloatPane(Constants.LEFT, arrowPoint, formatPane, 258, 255) { + Point arrowPoint = new Point(comPoint.x +formatButton.getWidth() - FineUIScale.scale(25), comPoint.y + formatButton.getHeight()); + UIBubbleFloatPane