Browse Source

Pull request #14417: REPORT-127438 - 设计器样式翻新组件翻新@Renekton

Merge in DESIGN/design from ~RENEKTON/design:newui to newui

* commit '06c28436c84c76d234b33c4d06b641e167d04e9a':
  控件管理/报表填报属性/超级链接/服务器参数
  控件管理/报表填报属性/超级链接/服务器参数
newui
Renekton-张世豪 4 months ago
parent
commit
6e0352df49
  1. 2
      designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java
  2. 2
      designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java
  3. 4
      designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

2
designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java

@ -42,8 +42,6 @@ public interface FineUIStyle {
String PURE_TREE = "pureTree"; String PURE_TREE = "pureTree";
String PASTEL_BUTTON = "pastelButton"; String PASTEL_BUTTON = "pastelButton";
String ENV_DECTETOR_BUTTON = "envDetectorButton";
/** /**
* 添加组件的样式类类似css该方法会接在原样式后方 * 添加组件的样式类类似css该方法会接在原样式后方

2
designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java vendored

@ -147,7 +147,7 @@ public class EnvDetectorDialog extends JDialog {
JPanel headerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel headerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
headerPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 12, 0)); headerPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 12, 0));
this.detectButton = new UIButton(buttonStatus.getDesc()); this.detectButton = new UIButton(buttonStatus.getDesc());
FineUIStyle.setStyle(detectButton, FineUIStyle.ENV_DECTETOR_BUTTON); FineUIStyle.setStyle(detectButton, FineUIStyle.STYLE_PRIMARY);
detectButton.setToolTipText(buttonStatus.getDesc()); detectButton.setToolTipText(buttonStatus.getDesc());
detectButton.addActionListener(event -> { detectButton.addActionListener(event -> {
if (buttonStatus.isNotExecuting()) { if (buttonStatus.isNotExecuting()) {

4
designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

@ -1333,7 +1333,3 @@ CellOtherSetPane.height=$Component.defaultHeight
[style]Tree.pureTree = \ [style]Tree.pureTree = \
background: $fill.normal background: $fill.normal
[style]Button.envDetectorButton = \
foreground: #FFF; \
background: #2576EF
Loading…
Cancel
Save