Browse Source

Pull request #14724: REPORT-132029 & REPORT-132224 & REPORT-131935 REPORT-131838【newUI】fix:fr-fbp回归问题修复

Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/release to fbp/release

* commit '4f9c9466dad99c54a98db6dad470eac4c9105c5e':
  REPORT-132029 & REPORT-132224 & REPORT-131935 REPORT-131838【newUI】fix:fr-fbp回归问题修复
  REPORT-132029 & REPORT-132224 & REPORT-131935 REPORT-131838【newUI】fix:fr-fbp回归问题修复
fbp/release
Richard.Fang-方超 3 months ago
parent
commit
530cf763e2
  1. 12
      designer-base/src/main/java/com/fine/theme/utils/FineUIScale.java
  2. 5
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  3. 2
      designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
  4. 44
      designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java
  5. 6
      designer-base/src/main/java/com/fr/design/gui/frpane/ClosableBubbleFloatPane.java
  6. 3
      designer-base/src/main/java/com/fr/design/gui/itooltip/MultiLineToolTip.java
  7. 12
      designer-base/src/main/java/com/fr/design/utils/DesignerPort.java
  8. 11
      designer-base/src/main/resources/com/fine/theme/icon/close/closeTag.svg
  9. 3
      designer-base/src/main/resources/com/fine/theme/icon/debug.svg
  10. 3
      designer-base/src/main/resources/com/fine/theme/icon/debug_disable.svg
  11. 1
      designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json
  12. 14
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
  13. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java
  14. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
  15. 30
      designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java
  16. 27
      designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportResultDataSeriesPane.java
  17. 13
      designer-chart/src/main/java/com/fr/van/chart/box/data/report/TinyFormulaWithEditLabel.java
  18. 13
      designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java
  19. 4
      designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java
  20. 3
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java
  21. 13
      designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java
  22. 19
      designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
  23. 3
      designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartCategoryStylePaneWithCheckBox.java
  24. 9
      designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
  25. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java
  26. 43
      designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartEffectPane.java
  27. 35
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java
  28. 26
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkReportDataContentPane.java
  29. 49
      designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java
  30. 4
      designer-form/src/main/java/com/fr/design/actions/TemplateParameterAction.java
  31. 3
      designer-form/src/main/java/com/fr/design/actions/file/export/EmbeddedFormExportExportAction.java
  32. 4
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveCustomAction.java
  33. 4
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java
  34. 3
      designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java
  35. 3
      designer-realize/src/main/java/com/fr/poly/actions/DeleteBlockAction.java

12
designer-base/src/main/java/com/fine/theme/utils/FineUIScale.java

@ -83,4 +83,16 @@ public class FineUIScale {
public static Insets scale(Insets insets) { public static Insets scale(Insets insets) {
return UIScale.scale(insets); return UIScale.scale(insets);
} }
/**
* Creates a scaled {@link Dimension} object based on the specified width and height.
* <p>
* This method uses the current user scale factor to adjust the provided width and height values:
* - If the user scale factor is 1 (no scaling), the original width and height values are returned unchanged.
* - If the user scale factor is different from 1, a new {@link Dimension} instance is created and returned,
* with the width and height values scaled according to the user scale factor.
*/
public static Dimension createScaleDimension(int width, int height) {
return scale(new Dimension(width, height));
}
} }

5
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -1,6 +1,7 @@
package com.fr.design.actions.file; package com.fr.design.actions.file;
import com.fine.swing.ui.layout.Row; import com.fine.swing.ui.layout.Row;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineLayoutBuilder; import com.fine.theme.utils.FineLayoutBuilder;
import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIScale;
import com.fine.theme.utils.FineUIStyle; import com.fine.theme.utils.FineUIStyle;
@ -731,10 +732,10 @@ public class PreferencePane extends BasicPane {
private Component createColorSettingPane() { private Component createColorSettingPane() {
// Color Setting Pane // Color Setting Pane
gridLineColorTBButton = new UINoThemeColorButton(IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png")); gridLineColorTBButton = new UINoThemeColorButton(new LazyIcon("foreground"));
gridLineColorTBButton.setEnabled(this.isEnabled()); gridLineColorTBButton.setEnabled(this.isEnabled());
paginationLineColorTBButton = new UINoThemeColorButton(IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png")); paginationLineColorTBButton = new UINoThemeColorButton(new LazyIcon("foreground"));
paginationLineColorTBButton.setEnabled(this.isEnabled()); paginationLineColorTBButton.setEnabled(this.isEnabled());
JPanel colorPanel = row(10, JPanel colorPanel = row(10,

2
designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java

@ -58,7 +58,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
} }
public ValueEditorPane(Editor[] cards, String popupName, String textEditorValue) { public ValueEditorPane(Editor[] cards, String popupName, String textEditorValue) {
initComponents(cards, popupName, textEditorValue, 200); initComponents(cards, popupName, textEditorValue, FineUIScale.scale(200));
} }
public ValueEditorPane(Editor[] cards, String popupName, String textEditorValue, int centerPaneWidth) { public ValueEditorPane(Editor[] cards, String popupName, String textEditorValue, int centerPaneWidth) {

44
designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java

@ -1,6 +1,14 @@
package com.fr.design.formula; package com.fr.design.formula;
import com.fine.theme.utils.FineUIScale;
import com.fr.base.BaseFormula; import com.fr.base.BaseFormula;
import com.fr.design.gui.ilable.UILabel;
import java.awt.Component;
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.swing.ui.layout.Layouts.flex;
/** /**
* @author Carlson * @author Carlson
@ -10,8 +18,44 @@ import com.fr.base.BaseFormula;
**/ **/
public class DefaultTinyFormulaPane extends TinyFormulaPane{ public class DefaultTinyFormulaPane extends TinyFormulaPane{
/**
* 默认构造方法
* 一个输入框和一个F(x)按钮
*/
public DefaultTinyFormulaPane() {
this.initComponents();
this.initLayout();
}
/**
* 带标题的构造方法
* 当需要显示标题时使用此构造方法
*
* @param title 要在布局中显示的标题
*/
public DefaultTinyFormulaPane(String title) {
this.initComponents();
this.initLayout(title);
}
private void initLayout(String title) {
this.setLayout(new BorderLayout());
this.add(row(cell(new UILabel(title)).weight(1.2), cell(createDefaultTinyFormulaPane()).weight(3)).getComponent());
}
@Override @Override
protected void populateTextField(BaseFormula fm) { protected void populateTextField(BaseFormula fm) {
formulaTextField.setText(fm.getContent()); formulaTextField.setText(fm.getContent());
} }
@Override
protected void initLayout() {
this.setLayout(new BorderLayout());
formulaTextFieldButton.setPreferredSize(FineUIScale.createScaleDimension(24, 24));
this.add(createDefaultTinyFormulaPane());
}
private Component createDefaultTinyFormulaPane() {
return row(cell(formulaTextField).weight(2), flex(0.1), cell(formulaTextFieldButton).weight(0.4)).getComponent();
}
} }

6
designer-base/src/main/java/com/fr/design/gui/frpane/ClosableBubbleFloatPane.java

@ -1,10 +1,9 @@
package com.fr.design.gui.frpane; 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.beans.BasicBeanPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import javax.swing.Icon;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Point; import java.awt.Point;
@ -30,8 +29,7 @@ public abstract class ClosableBubbleFloatPane<T> extends UIBubbleFloatPane<T> {
protected JPanel initTopOptionMenu() { protected JPanel initTopOptionMenu() {
JPanel menu = new JPanel(new BorderLayout()); JPanel menu = new JPanel(new BorderLayout());
Icon icon = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png"); UILabel label = new UILabel(new LazyIcon("close"));
UILabel label = new UILabel(icon);
label.addMouseListener(new MouseAdapter() { label.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {

3
designer-base/src/main/java/com/fr/design/gui/itooltip/MultiLineToolTip.java

@ -1,10 +1,11 @@
package com.fr.design.gui.itooltip; package com.fr.design.gui.itooltip;
import com.fine.theme.light.ui.FineTooltipUI;
import javax.swing.JToolTip; import javax.swing.JToolTip;
public class MultiLineToolTip extends JToolTip { public class MultiLineToolTip extends JToolTip {
public MultiLineToolTip() { public MultiLineToolTip() {
setUI(new MultiLineToolTipUI()); setUI(new FineTooltipUI());
} }
} }

12
designer-base/src/main/java/com/fr/design/utils/DesignerPort.java

@ -1,5 +1,7 @@
package com.fr.design.utils; package com.fr.design.utils;
import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineUIScale;
import com.fr.common.report.ReportState; import com.fr.common.report.ReportState;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.RestartHelper; import com.fr.design.RestartHelper;
@ -13,7 +15,6 @@ import com.fr.design.port.DesignerPortContext;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.exit.DesignerExiter; import com.fr.exit.DesignerExiter;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.IOUtils;
import com.fr.process.engine.core.CarryMessageEvent; import com.fr.process.engine.core.CarryMessageEvent;
import com.fr.process.engine.core.FineProcessContext; import com.fr.process.engine.core.FineProcessContext;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
@ -29,11 +30,12 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout; import java.awt.FlowLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import static com.fine.theme.utils.FineUIScale.scale;
/** /**
* 为的就是能替换 DesignPort.class 实现多开,因此避免编译器常量编译展开优化 * 为的就是能替换 DesignPort.class 实现多开,因此避免编译器常量编译展开优化
*/ */
@ -128,7 +130,7 @@ public class DesignerPort implements XMLReadable, XMLWriter {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setModal(true); this.setModal(true);
this.portFiled = new UITextField(); this.portFiled = new UITextField();
this.portFiled.setPreferredSize(new Dimension(180, 20)); this.portFiled.setPreferredSize(FineUIScale.createScaleDimension(180, 20));
this.portFiled.getDocument().addDocumentListener(new DocumentListener() { this.portFiled.getDocument().addDocumentListener(new DocumentListener() {
@Override @Override
public void insertUpdate(DocumentEvent e) { public void insertUpdate(DocumentEvent e) {
@ -147,7 +149,7 @@ public class DesignerPort implements XMLReadable, XMLWriter {
}); });
JPanel iconPanel = new JPanel(); JPanel iconPanel = new JPanel();
UILabel iconLabel = new UILabel(); UILabel iconLabel = new UILabel();
iconLabel.setIcon(IOUtils.readIcon("com/fr/design/images/edit/edit_typing.png")); iconLabel.setIcon(new LazyIcon("edit"));
iconPanel.add(iconLabel); iconPanel.add(iconLabel);
iconPanel.add(iconLabel); iconPanel.add(iconLabel);
JPanel textPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 10); JPanel textPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 10);
@ -194,7 +196,7 @@ public class DesignerPort implements XMLReadable, XMLWriter {
this.add(northPane, BorderLayout.NORTH); this.add(northPane, BorderLayout.NORTH);
this.add(centerPane, BorderLayout.CENTER); this.add(centerPane, BorderLayout.CENTER);
this.add(southPane, BorderLayout.SOUTH); this.add(southPane, BorderLayout.SOUTH);
this.setSize(300, 150); this.setSize(scale(300), scale(150));
this.setTitle(Toolkit.i18nText("Fine-Design_Modify_Designer_Port")); this.setTitle(Toolkit.i18nText("Fine-Design_Modify_Designer_Port"));
this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
this.setResizable(false); this.setResizable(false);

11
designer-base/src/main/resources/com/fine/theme/icon/close/closeTag.svg

@ -0,0 +1,11 @@
<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_6051_60709)">
<path d="M0 0H8C9.10457 0 10 0.895431 10 2V10H2C0.89543 10 0 9.10457 0 8V0Z" fill="#0A1C38" fill-opacity="0.66"/>
<path d="M4.55806 4.99999L2.34835 7.20969C2.22631 7.33173 2.22631 7.5296 2.34835 7.65164C2.47039 7.77368 2.66825 7.77368 2.79029 7.65164L5 5.44193L7.20971 7.65164C7.33175 7.77368 7.52961 7.77368 7.65165 7.65164C7.77369 7.5296 7.77369 7.33173 7.65165 7.2097L5.44194 4.99999L7.65165 2.79028C7.77369 2.66824 7.77369 2.47037 7.65165 2.34834C7.52961 2.2263 7.33175 2.2263 7.20971 2.34834L5 4.55804L2.79029 2.34834C2.66825 2.2263 2.47039 2.2263 2.34835 2.34834C2.22631 2.47038 2.22631 2.66824 2.34835 2.79028L4.55806 4.99999Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_6051_60709">
<path d="M0 0H8C9.10457 0 10 0.895431 10 2V10H2C0.89543 10 0 9.10457 0 8V0Z" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 949 B

3
designer-base/src/main/resources/com/fine/theme/icon/debug.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 4H28V28H4V4ZM2 4C2 2.89543 2.89543 2 4 2H28C29.1046 2 30 2.89543 30 4V28C30 29.1046 29.1046 30 28 30H4C2.89543 30 2 29.1046 2 28V4ZM22 13C20.8954 13 20 12.1046 20 11C20 9.89543 20.8954 9 22 9C23.1046 9 24 9.89543 24 11C24 12.1046 23.1046 13 22 13ZM18.126 10L7 10C6.44772 10 6 10.4477 6 11C6 11.5523 6.44772 12 7 12H18.126C18.5701 13.7252 20.1362 15 22 15C24.2091 15 26 13.2091 26 11C26 8.79086 24.2091 7 22 7C20.1362 7 18.5701 8.27477 18.126 10ZM10 23C11.1046 23 12 22.1046 12 21C12 19.8954 11.1046 19 10 19C8.89543 19 8 19.8954 8 21C8 22.1046 8.89543 23 10 23ZM13.874 20C13.4299 18.2748 11.8638 17 10 17C7.79086 17 6 18.7909 6 21C6 23.2091 7.79086 25 10 25C11.8638 25 13.4299 23.7252 13.874 22H25C25.5523 22 26 21.5523 26 21C26 20.4477 25.5523 20 25 20H13.874Z" fill="#0A1C38" fill-opacity="0.9"/>
</svg>

After

Width:  |  Height:  |  Size: 954 B

3
designer-base/src/main/resources/com/fine/theme/icon/debug_disable.svg

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 4H28V28H4V4ZM2 4C2 2.89543 2.89543 2 4 2H28C29.1046 2 30 2.89543 30 4V28C30 29.1046 29.1046 30 28 30H4C2.89543 30 2 29.1046 2 28V4ZM22 13C20.8954 13 20 12.1046 20 11C20 9.89543 20.8954 9 22 9C23.1046 9 24 9.89543 24 11C24 12.1046 23.1046 13 22 13ZM18.126 10L7 10C6.44772 10 6 10.4477 6 11C6 11.5523 6.44772 12 7 12H18.126C18.5701 13.7252 20.1362 15 22 15C24.2091 15 26 13.2091 26 11C26 8.79086 24.2091 7 22 7C20.1362 7 18.5701 8.27477 18.126 10ZM10 23C11.1046 23 12 22.1046 12 21C12 19.8954 11.1046 19 10 19C8.89543 19 8 19.8954 8 21C8 22.1046 8.89543 23 10 23ZM13.874 20C13.4299 18.2748 11.8638 17 10 17C7.79086 17 6 18.7909 6 21C6 23.2091 7.79086 25 10 25C11.8638 25 13.4299 23.7252 13.874 22H25C25.5523 22 26 21.5523 26 21C26 20.4477 25.5523 20 25 20H13.874Z" fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 955 B

1
designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json

@ -322,6 +322,7 @@
"nosort": "sort/nosort.svg", "nosort": "sort/nosort.svg",
"close": "close/close.svg", "close": "close/close.svg",
"close_round": "close/close_round.svg", "close_round": "close/close_round.svg",
"closeTag": "close/closeTag.svg",
"platform_close": "close/platform_close.svg", "platform_close": "close/platform_close.svg",
"add_parenthesis": "font/add_parenthesis.svg", "add_parenthesis": "font/add_parenthesis.svg",
"remove_parenthesis": "font/remove_parenthesis.svg", "remove_parenthesis": "font/remove_parenthesis.svg",

14
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@ -4,7 +4,6 @@ import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineLayoutBuilder; import com.fine.theme.utils.FineLayoutBuilder;
import com.fine.theme.utils.FineUIConstants; import com.fine.theme.utils.FineUIConstants;
import com.fine.theme.utils.FineUIStyle; import com.fine.theme.utils.FineUIStyle;
import com.fr.base.BaseUtils;
import com.fr.chart.base.AttrChangeConfig; import com.fr.chart.base.AttrChangeConfig;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.charttypes.ChartTypeManager; import com.fr.chart.charttypes.ChartTypeManager;
@ -29,12 +28,12 @@ import com.fr.stable.StringUtils;
import com.fr.van.chart.config.DefaultStyleHelper4Van; import com.fr.van.chart.config.DefaultStyleHelper4Van;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.Icon;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Image;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -44,7 +43,6 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -56,6 +54,7 @@ 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.column;
import static com.fine.swing.ui.layout.Layouts.flex; 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.row;
import static com.fine.theme.utils.FineUIScale.scale;
/** /**
* 图表 类型 增删 控制按钮界面. * 图表 类型 增删 控制按钮界面.
@ -458,8 +457,8 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
private class ChartChangeButton extends UIToggleButton { private class ChartChangeButton extends UIToggleButton {
private static final double DEL_WIDTH = 10; private static final double DEL_WIDTH = 9;
private BufferedImage closeIcon = BaseUtils.readImageWithCache("com/fr/design/images/toolbarbtn/chartChangeClose.png"); private Icon closeIcon = new LazyIcon("closeTag", 8);
private boolean isMoveOn = false; private boolean isMoveOn = false;
private String buttonName = ""; private String buttonName = "";
@ -506,11 +505,8 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
private void paintDeleteButton(Graphics g2d) { private void paintDeleteButton(Graphics g2d) {
Rectangle2D bounds = this.getBounds(); Rectangle2D bounds = this.getBounds();
int x = (int) (bounds.getWidth() - DEL_WIDTH); int x = (int) (bounds.getWidth() - DEL_WIDTH);
int y = (int) (1); closeIcon.paintIcon(this, g2d, scale(x), scale(1));
g2d.drawImage((Image) closeIcon, x, y, closeIcon.getWidth(), closeIcon.getHeight(), null);
} }
@Override @Override

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@ -41,6 +41,8 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent); filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
this.add(column( this.add(column(
cell(categoryName), cell(categoryName),
fix(10),
cell(getSeriesPane()),
fix(10).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder())), fix(10).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder())),
cell(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane)) cell(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane))
).getComponent()); ).getComponent());
@ -53,7 +55,7 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
UILabel label = new UILabel(leftLabel); UILabel label = new UILabel(leftLabel);
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.add(row( this.add(row(
cell(label).weight(1.2), cell(formulaTextField).weight(2), flex(0.1), cell(formulaTextFieldButton).weight(0.4) cell(label).weight(1.2), row(cell(formulaTextField).weight(2), flex(0.1), cell(formulaTextFieldButton).weight(0.4)).weight(3)
).getComponent()); ).getComponent());
} }

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@ -99,10 +99,10 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
UILabel label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value")); UILabel label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
centerPane = column(10, centerPane = column(10,
row( row(
cell(label1).weight(1), cell(seriesName).weight(2) cell(label1).weight(1.2), cell(seriesName).weight(3)
), ),
row( row(
cell(label2).weight(1), cell(seriesValue).weight(2) cell(label2).weight(1.2), cell(seriesValue).weight(3)
), ),
fix(1).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder())) fix(1).with(it -> it.setBorder(FineBorderFactory.createDefaultUnderlineBorder()))
).getComponent(); ).getComponent();

30
designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java

@ -1,24 +1,25 @@
package com.fr.van.chart.box.data.report; package com.fr.van.chart.box.data.report;
import com.fine.theme.utils.FineLayoutBuilder;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Plot;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartDataPane;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.plugin.chart.box.VanChartBoxPlot; import com.fr.plugin.chart.box.VanChartBoxPlot;
import com.fr.plugin.chart.box.data.VanBoxReportDefinition; import com.fr.plugin.chart.box.data.VanBoxReportDefinition;
import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import static com.fine.swing.ui.layout.Layouts.cell;
import static com.fine.swing.ui.layout.Layouts.column;
public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane { public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane {
private UIButtonGroup dataType; private UIButtonGroup dataType;
@ -30,37 +31,20 @@ public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane
public BoxPlotReportDataContentPane(Plot plot, ChartDataPane parent) { public BoxPlotReportDataContentPane(Plot plot, ChartDataPane parent) {
this.initplot = plot; this.initplot = plot;
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.add(column(LayoutConstants.VERTICAL_GAP, cell(createDataTypePane()), cell(createSeriesPane(parent))).getComponent());
this.add(createDataTypePane(), BorderLayout.NORTH);
this.add(createSeriesPane(parent), BorderLayout.CENTER);
initDataTypeListener(); initDataTypeListener();
checkDataPaneVisible(); checkDataPaneVisible();
} }
private JPanel createDataTypePane() { private JPanel createDataTypePane() {
JPanel pane = new JPanel(new BorderLayout(4, 0));
pane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Form"));
label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
String[] names = new String[]{ String[] names = new String[]{
Toolkit.i18nText("Fine-Design_Chart_Detailed_Data"), Toolkit.i18nText("Fine-Design_Chart_Detailed_Data"),
Toolkit.i18nText("Fine-Design_Chart_Result_Data") Toolkit.i18nText("Fine-Design_Chart_Result_Data")
}; };
dataType = new UIButtonGroup(names); dataType = new UIButtonGroup(names);
dataType.setSelectedIndex(0); dataType.setSelectedIndex(0);
dataType.setPreferredSize(new Dimension(100, 20)); return FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Form")), dataType);
pane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{dataType, null, null, label, null}));
pane.setPreferredSize(new Dimension(246, 30));
pane.setBorder(BorderFactory.createEmptyBorder(0, 18, 10, 15));
return pane;
} }
private JPanel createSeriesPane(ChartDataPane parent) { private JPanel createSeriesPane(ChartDataPane parent) {

27
designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportResultDataSeriesPane.java

@ -3,7 +3,6 @@ package com.fr.van.chart.box.data.report;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.DefaultTinyFormulaPane;
import com.fr.design.formula.TinyFormulaPane; import com.fr.design.formula.TinyFormulaPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
@ -11,11 +10,9 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
import com.fr.plugin.chart.box.data.VanBoxReportDefinition; import com.fr.plugin.chart.box.data.VanBoxReportDefinition;
import com.fr.plugin.chart.box.data.VanBoxReportResultDefinition; import com.fr.plugin.chart.box.data.VanBoxReportResultDefinition;
import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; import java.awt.Component;
import java.awt.Dimension;
public class BoxPlotReportResultDataSeriesPane extends AbstractReportDataContentPane { public class BoxPlotReportResultDataSeriesPane extends AbstractReportDataContentPane {
@ -34,16 +31,13 @@ public class BoxPlotReportResultDataSeriesPane extends AbstractReportDataContent
initContentComponents(); initContentComponents();
JPanel panel = createContentPane(); JPanel panel = createContentPane();
panel.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
this.add(panel, BorderLayout.CENTER); this.add(panel, BorderLayout.CENTER);
} }
private void initContentComponents() { private void initContentComponents() {
category = createTinyFormulaPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Category")); category = new DefaultTinyFormulaPane(Toolkit.i18nText("Fine-Design_Chart_Category"));
seriesName = createTinyFormulaPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Series_Name")); seriesName = new DefaultTinyFormulaPane(Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
max = createTinyFormulaWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Max")); max = createTinyFormulaWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Max"));
q3 = createTinyFormulaWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Q3")); q3 = createTinyFormulaWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Q3"));
@ -71,23 +65,6 @@ public class BoxPlotReportResultDataSeriesPane extends AbstractReportDataContent
return TableLayoutHelper.createTableLayoutPane(components, row, col); return TableLayoutHelper.createTableLayoutPane(components, row, col);
} }
private TinyFormulaPane createTinyFormulaPaneWithTitle(final String title) {
return new DefaultTinyFormulaPane() {
protected void initLayout() {
this.setLayout(new BorderLayout(4, 0));
UILabel label = new UILabel(title);
label.setPreferredSize(new Dimension(75, 20));
this.add(label, BorderLayout.WEST);
formulaTextField.setPreferredSize(new Dimension(100, 20));
this.add(formulaTextField, BorderLayout.CENTER);
this.add(formulaTextFieldButton, BorderLayout.EAST);
}
};
}
private TinyFormulaWithEditLabel createTinyFormulaWithEditLabel(String title) { private TinyFormulaWithEditLabel createTinyFormulaWithEditLabel(String title) {
return new TinyFormulaWithEditLabel(title) { return new TinyFormulaWithEditLabel(title) {

13
designer-chart/src/main/java/com/fr/van/chart/box/data/report/TinyFormulaWithEditLabel.java

@ -9,7 +9,9 @@ import com.fr.design.mainframe.chart.gui.UIEditLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import java.awt.BorderLayout; 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.row;
public abstract class TinyFormulaWithEditLabel extends JPanel implements UIObserver { public abstract class TinyFormulaWithEditLabel extends JPanel implements UIObserver {
@ -23,18 +25,13 @@ public abstract class TinyFormulaWithEditLabel extends JPanel implements UIObser
protected void doAfterMousePress() { protected void doAfterMousePress() {
clearAllBackground(); clearAllBackground();
} }
protected boolean appendOriginalLabel() { protected boolean appendOriginalLabel() {
return false; return false;
} }
}; };
editLabel.setPreferredSize(new Dimension(75, 20));
tinyFormulaPane = new DefaultTinyFormulaPane(); tinyFormulaPane = new DefaultTinyFormulaPane();
this.setLayout(new BorderLayout(0, 10));
this.setLayout(new BorderLayout(4, 0)); this.add(row(cell(editLabel).weight(1.2), cell(tinyFormulaPane).weight(3)).getComponent());
this.add(editLabel, BorderLayout.WEST);
this.add(tinyFormulaPane, BorderLayout.CENTER);
} }
protected abstract void clearAllBackground(); protected abstract void clearAllBackground();

13
designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java

@ -8,9 +8,11 @@ import com.fr.design.mainframe.chart.gui.UIEditLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ItemListener; import java.awt.event.ItemListener;
import static com.fine.swing.ui.layout.Layouts.cell;
import static com.fine.swing.ui.layout.Layouts.row;
public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserver { public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserver {
private UIEditLabel editLabel; private UIEditLabel editLabel;
@ -28,14 +30,9 @@ public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserv
return false; return false;
} }
}; };
editLabel.setPreferredSize(new Dimension(80, 20));
comboBox = new UIComboBox(); comboBox = new UIComboBox();
comboBox.setPreferredSize(new Dimension(100, 20)); this.setLayout(new BorderLayout(0, 10));
this.add(row(cell(editLabel).weight(1.2), cell(comboBox).weight(3)).getComponent());
this.setLayout(new BorderLayout(4, 0));
this.add(editLabel, BorderLayout.WEST);
this.add(comboBox, BorderLayout.CENTER);
} }
public UIComboBox getComboBox() { public UIComboBox getComboBox() {

4
designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java

@ -1,5 +1,6 @@
package com.fr.van.chart.custom.component; package com.fr.van.chart.custom.component;
import com.fine.theme.utils.FineUIScale;
import com.fr.chart.base.ChartThemeStyleProvider; import com.fr.chart.base.ChartThemeStyleProvider;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
@ -20,7 +21,6 @@ import com.fr.van.chart.custom.CustomPlotDesignerPaneFactory;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.ArrayList; import java.util.ArrayList;
@ -87,7 +87,7 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane<Chart> {
content = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(CUSTOM_TYPE_NUM, 0, 0); content = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(CUSTOM_TYPE_NUM, 0, 0);
for (int i = 0; i < customTypeList.size(); i++){ for (int i = 0; i < customTypeList.size(); i++){
customTypeList.get(i).setPreferredSize(new Dimension(REC_WIDTH,REC_HEIGHT)); customTypeList.get(i).setPreferredSize(FineUIScale.createScaleDimension(REC_WIDTH, REC_HEIGHT));
//是否画右边线 //是否画右边线
boolean isRightLine = (i == customTypeList.size() - 1) ? true : ((i + 1)%CUSTOM_TYPE_NUM == 0) ? true : false; boolean isRightLine = (i == customTypeList.size() - 1) ? true : ((i + 1)%CUSTOM_TYPE_NUM == 0) ? true : false;

3
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java

@ -34,7 +34,8 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
if (isInCondition() || !ChartEditContext.supportTheme()) { if (isInCondition() || !ChartEditContext.supportTheme()) {
return super.createCommonStylePane(); return super.createCommonStylePane();
} }
setTextAttrPane(new LabelAttrPaneWithThemeStyle()); // 颜色图标统一使用UIColorButton
setTextAttrPane(new ChartTextAttrPaneWithThemeStyle());
JPanel stylePanel = new JPanel(new BorderLayout()); JPanel stylePanel = new JPanel(new BorderLayout());
stylePanel.add(getTextAttrPane(), BorderLayout.CENTER); stylePanel.add(getTextAttrPane(), BorderLayout.CENTER);

13
designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java

@ -3,14 +3,11 @@ package com.fr.van.chart.designer.other.condition.item;
import com.fr.chart.base.DataSeriesCondition; import com.fr.chart.base.DataSeriesCondition;
import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Plot;
import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.condition.ConditionAttributesPane;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.plugin.chart.base.AttrLabel; import com.fr.plugin.chart.base.AttrLabel;
import com.fr.van.chart.designer.PlotFactory; import com.fr.van.chart.designer.PlotFactory;
import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane; import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.Component;
public class VanChartLabelConditionPane extends AbstractNormalMultiLineConditionPane { public class VanChartLabelConditionPane extends AbstractNormalMultiLineConditionPane {
@ -25,15 +22,7 @@ public class VanChartLabelConditionPane extends AbstractNormalMultiLineCondition
@Override @Override
protected JPanel initContentPane() { protected JPanel initContentPane() {
dataLabelContentsPane = createLabelPane(); dataLabelContentsPane = createLabelPane();
double p = TableLayout.PREFERRED; return dataLabelContentsPane;
double f = TableLayout.FILL;
double e = 220;
Component[][] components = new Component[][]{
new Component[]{dataLabelContentsPane}
};
return TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{e});
} }
protected VanChartPlotLabelPane createLabelPane() { protected VanChartPlotLabelPane createLabelPane() {

19
designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@ -10,6 +10,7 @@ import com.fr.chart.base.TextAttr;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Title; import com.fr.chart.chartattr.Title;
import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.DefaultTinyFormulaPane;
import com.fr.design.formula.TinyFormulaPane; import com.fr.design.formula.TinyFormulaPane;
@ -269,10 +270,15 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
} }
} }
}; };
// 显示逻辑-整体显示
labelStylePane.add(wholeDisplayLabelPanel, WHOLE_DISPLAY); labelStylePane.add(wholeDisplayLabelPanel, WHOLE_DISPLAY);
// 显示逻辑-分层显示
labelStylePane.add(createCategoryStylePane(), LAYER_DISPLAY); labelStylePane.add(createCategoryStylePane(), LAYER_DISPLAY);
showLogicPane.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show_Logic"), showLogic), BorderLayout.NORTH); showLogicPane.add(column(LayoutConstants.VERTICAL_GAP,
showLogicPane.add(labelStylePane, BorderLayout.CENTER); cell(FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, new UILabel(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show_Logic")), showLogic)),
cell(labelStylePane)
).getComponent());
showLogicPane.setVisible(false); showLogicPane.setVisible(false);
labelContentPane.add(labelPane, BorderLayout.NORTH); labelContentPane.add(labelPane, BorderLayout.NORTH);
labelContentPane.add(showLogicPane, BorderLayout.CENTER); labelContentPane.add(showLogicPane, BorderLayout.CENTER);
@ -654,18 +660,11 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
private JPanel createCateLableStylePanel() { private JPanel createCateLableStylePanel() {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
double[] row = getCateLableStylePaneRow(); double[] row = getCateLableStylePaneRow();
double[] column = {f, p}; double[] column = {f, p};
JPanel content = TableLayoutHelper.createTableLayoutPane(getCateLabelStyleComponents(), row, column); JPanel content = TableLayoutHelper.createTableLayoutPane(getCateLabelStyleComponents(), row, column);
return FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category")), content);
Component[][] components = new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category")), content}
};
return TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p}, new double[]{f, e});
} }
private Component[][] getCateLabelStyleComponents() { private Component[][] getCateLabelStyleComponents() {

3
designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartCategoryStylePaneWithCheckBox.java

@ -1,5 +1,6 @@
package com.fr.van.chart.designer.style.axis.component; package com.fr.van.chart.designer.style.axis.component;
import com.fine.theme.utils.FineUIScale;
import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
import com.fr.design.gui.frpane.ClosableBubbleFloatPane; import com.fr.design.gui.frpane.ClosableBubbleFloatPane;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
@ -68,7 +69,7 @@ public class VanChartCategoryStylePaneWithCheckBox extends JPanel {
Point comPoint = settingButton.getLocationOnScreen(); Point comPoint = settingButton.getLocationOnScreen();
Point arrowPoint = new Point(comPoint.x +settingButton.getWidth() - 25, comPoint.y + settingButton.getHeight()); Point arrowPoint = new Point(comPoint.x +settingButton.getWidth() - 25, comPoint.y + settingButton.getHeight());
Dimension size = settingPane.getPreferredSize(); Dimension size = settingPane.getPreferredSize();
ClosableBubbleFloatPane<VanChartAxisLabelStyle> pane = new ClosableBubbleFloatPane(Constants.LEFT, arrowPoint, settingPane, size.width, 240) { ClosableBubbleFloatPane<VanChartAxisLabelStyle> pane = new ClosableBubbleFloatPane(Constants.LEFT, arrowPoint, settingPane, size.width, FineUIScale.scale(240)) {
@Override @Override
public void updateContentPane() { public void updateContentPane() {

9
designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@ -9,12 +9,10 @@ import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.ibutton.UIToggleButton;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
import com.fr.design.style.color.ColorSelectBox; import com.fr.design.style.color.ColorSelectBox;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
@ -241,10 +239,12 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
column.add(positionPane); column.add(positionPane);
if (hasLabelOrientationPane()) { if (hasLabelOrientationPane()) {
// 文本方向
column.add(createLabelOrientationPane()); column.add(createLabelOrientationPane());
} }
if (plot.isSupportLeadLine()) { if (plot.isSupportLeadLine()) {
// 牵引线
tractionLine = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Show_Guideline")); tractionLine = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
Component[][] comps = new Component[1][2]; Component[][] comps = new Component[1][2];
comps[0] = new Component[]{new UILabel(), tractionLine}; comps[0] = new Component[]{new UILabel(), tractionLine};
@ -255,6 +255,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
column.add(getLabelPositionPane(comps, row, col)); column.add(getLabelPositionPane(comps, row, col));
initPositionListener(); initPositionListener();
} else if (PlotFactory.plotAutoAdjustLabelPosition(plot)) { } else if (PlotFactory.plotAutoAdjustLabelPosition(plot)) {
// 重叠调整
column.add(FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, column.add(FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3},
new UILabel(Toolkit.i18nText("Fine-Design_Chart_Auto_Adjust")), autoAdjust)); new UILabel(Toolkit.i18nText("Fine-Design_Chart_Auto_Adjust")), autoAdjust));
} }
@ -281,8 +282,8 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
checkOrientation(); checkOrientation();
} }
}); });
return FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3},
return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation"), orientation); new UILabel(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation")), orientation);
} }
protected void checkPositionPane(String title) { protected void checkPositionPane(String title) {

4
designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@ -278,13 +278,13 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
protected JPanel createStackedAndAxisPane() { protected JPanel createStackedAndAxisPane() {
stackAndAxisEditPane = new VanChartStackedAndAxisListControlPane(); stackAndAxisEditPane = new VanChartStackedAndAxisListControlPane();
stackAndAxisEditExpandablePane = new UIExpandablePane(stackAndAxisEditPane.getPaneTitle(), stackAndAxisEditPane, true); stackAndAxisEditExpandablePane = new UIExpandablePane(stackAndAxisEditPane.getPaneTitle(), stackAndAxisEditPane, true);
stackAndAxisEditExpandablePane.setVisible(true);
return stackAndAxisEditExpandablePane; return stackAndAxisEditExpandablePane;
} }
//界面上删除堆积和坐标轴设置 //界面上删除堆积和坐标轴设置
protected void removeStackWholePane() { protected void removeStackWholePane() {
contentPane.remove(stackAndAxisEditExpandablePane); stackAndAxisEditExpandablePane.setVisible(false);
contentPane.repaint();
} }
/** /**

43
designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartEffectPane.java

@ -1,19 +1,23 @@
package com.fr.van.chart.designer.style.series; package com.fr.van.chart.designer.style.series;
import com.fine.theme.utils.FineLayoutBuilder;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.i18n.Toolkit;
import com.fr.plugin.chart.base.AttrEffect; import com.fr.plugin.chart.base.AttrEffect;
import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.awt.BorderLayout; 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.fix;
import static com.fine.swing.ui.layout.Layouts.row;
/** /**
* Created by shine on 2016/12/13. * Created by shine on 2016/12/13.
@ -40,33 +44,32 @@ public class VanChartEffectPane extends BasicBeanPane<AttrEffect> {
period = new UISpinner(0, Double.MAX_VALUE, 0.1, 0); period = new UISpinner(0, Double.MAX_VALUE, 0.1, 0);
content = createContentPane(); content = createContentPane();
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Flash_Animation"),enabledButton); JPanel panel = FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3}, new UILabel(Toolkit.i18nText("Fine-Design_Chart_Flash_Animation")), enabledButton);
this.setLayout(new BorderLayout(0, 5)); panel.setBorder(new ScaledEmptyBorder(0, 0, 10,0));
this.setLayout(new BorderLayout());
if(hasEnabledChoose) { if(hasEnabledChoose) {
this.add(panel, BorderLayout.NORTH); this.add(panel, BorderLayout.NORTH);
setContentPaneBorder();
} }
this.add(content, BorderLayout.CENTER); this.add(content, BorderLayout.CENTER);
} }
protected void setContentPaneBorder() { /**
content.setBorder(BorderFactory.createEmptyBorder(10,25,0,15)); * 闪烁动画
} * @return contentPane
*/
protected JPanel createContentPane() { protected JPanel createContentPane() {
JPanel panel = createPeriodPane(); return createPeriodPane();
return panel;
} }
/**
* 运动周期
* @return periodPane
*/
protected JPanel createPeriodPane(){ protected JPanel createPeriodPane(){
JPanel periodPane = new JPanel(); JPanel panel = new JPanel(new BorderLayout());
periodPane.setLayout(new BorderLayout(5, 0)); panel.add(row(cell(period).weight(1), fix(4),cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Second")))).getComponent());
UILabel label1= new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Flash_Period")); return FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3},
label1.setPreferredSize(new Dimension((int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 20)); new UILabel(Toolkit.i18nText("Fine-Design_Chart_Flash_Period")), panel);
periodPane.add(label1, BorderLayout.WEST);
periodPane.add(period, BorderLayout.CENTER);
periodPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Second")), BorderLayout.EAST);
return periodPane;
} }
@Override @Override

35
designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java

@ -6,7 +6,6 @@ import com.fr.base.chart.chartdata.TopDefinitionProvider;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.DefaultTinyFormulaPane;
import com.fr.design.formula.TinyFormulaPane; import com.fr.design.formula.TinyFormulaPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
import com.fr.plugin.chart.gantt.data.VanGanttReportDefinition; import com.fr.plugin.chart.gantt.data.VanGanttReportDefinition;
import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper; import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper;
@ -15,10 +14,6 @@ import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; 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;
/** /**
* Created by hufan on 2017/1/11. * Created by hufan on 2017/1/11.
*/ */
@ -40,30 +35,12 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{
} }
private void initAllComponent() { private void initAllComponent() {
seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")); seriesName = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
startTime = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time"));
startTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time")); endTime = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time"));
markerTime = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time"));
endTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time")); progress = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process"));
linkID = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Task_ID"));
markerTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time"));
progress = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process"));
linkID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Task_ID"));
}
private TinyFormulaPane createTinyFormulaPaneWithTitle(final String title) {
return new DefaultTinyFormulaPane() {
@Override
protected void initLayout() {
this.setLayout(new BorderLayout());
UILabel label = new UILabel(title);
this.add(row(
cell(label).weight(1.2), cell(formulaTextField).weight(2.4), flex(0.1), cell(formulaTextFieldButton).weight(0.5)
).getComponent());
}
};
} }
private JPanel getContentPane(){ private JPanel getContentPane(){

26
designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkReportDataContentPane.java

@ -5,7 +5,6 @@ import com.fr.base.chart.chartdata.TopDefinitionProvider;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.design.formula.DefaultTinyFormulaPane; import com.fr.design.formula.DefaultTinyFormulaPane;
import com.fr.design.formula.TinyFormulaPane; import com.fr.design.formula.TinyFormulaPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
import com.fr.plugin.chart.gantt.data.VanGanttLinkReportDefinition; import com.fr.plugin.chart.gantt.data.VanGanttLinkReportDefinition;
import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper; import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper;
@ -14,10 +13,6 @@ import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component; 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;
/** /**
* Created by hufan on 2017/1/12. * Created by hufan on 2017/1/12.
*/ */
@ -33,24 +28,9 @@ public class GanttLinkReportDataContentPane extends AbstractReportDataContentPan
this.add(panel, BorderLayout.CENTER); } this.add(panel, BorderLayout.CENTER); }
private void initAllComponent() { private void initAllComponent() {
startTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Task_ID")); startTaskID = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Task_ID"));
endTaskID = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Task_ID"));
endTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Task_ID")); linkType = new DefaultTinyFormulaPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Type"));
linkType = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Type"));
}
private TinyFormulaPane createTinyFormulaPaneWithTitle(final String title) {
return new DefaultTinyFormulaPane() {
@Override
protected void initLayout() {
this.setLayout(new BorderLayout());
UILabel label = new UILabel(title);
this.add(row(
cell(label).weight(1.2), cell(formulaTextField).weight(2.4), flex(0.1), cell(formulaTextFieldButton).weight(0.5)
).getComponent());
}
};
} }
private JPanel getContentPane(){ private JPanel getContentPane(){

49
designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java

@ -1,7 +1,11 @@
package com.fr.van.chart.map.line; package com.fr.van.chart.map.line;
import com.fine.theme.utils.FineLayoutBuilder;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.plugin.chart.base.AttrEffect; import com.fr.plugin.chart.base.AttrEffect;
@ -11,7 +15,6 @@ import com.fr.van.chart.designer.TableLayout4VanChartHelper;
import com.fr.van.chart.designer.component.marker.VanChartImageMarkerPane; import com.fr.van.chart.designer.component.marker.VanChartImageMarkerPane;
import com.fr.van.chart.designer.style.series.VanChartEffectPane; import com.fr.van.chart.designer.style.series.VanChartEffectPane;
import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
@ -20,6 +23,9 @@ import java.awt.Dimension;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
import java.awt.event.ItemListener; import java.awt.event.ItemListener;
import static com.fine.swing.ui.layout.Layouts.cell;
import static com.fine.swing.ui.layout.Layouts.column;
/** /**
* Created by hufan on 2016/12/20. * Created by hufan on 2016/12/20.
*/ */
@ -32,39 +38,34 @@ public class VanChartLineMapEffectPane extends VanChartEffectPane {
public VanChartLineMapEffectPane() { public VanChartLineMapEffectPane() {
super(true); super(true);
this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Map_Animation"), enabledButton), BorderLayout.NORTH); JPanel panel = FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3},
new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Map_Animation")), enabledButton);
panel.setBorder(new ScaledEmptyBorder(0, 0, 10,0));
this.add(panel, BorderLayout.NORTH);
} }
/**
* 流向动画
* @return contentPane
*/
protected JPanel createContentPane() { protected JPanel createContentPane() {
JPanel panel = new JPanel(new BorderLayout(0, 5)); JPanel panel = new JPanel(new BorderLayout());
// 运动周期
JPanel periodPane = createPeriodPane(); JPanel periodPane = createPeriodPane();
// 运动方式
animationType = new UIComboBox(LineMapAnimationType.getTypes()); animationType = new UIComboBox(LineMapAnimationType.getTypes());
initTypeContentPane(); initTypeContentPane();
panel.add(column(LayoutConstants.VERTICAL_GAP, cell(periodPane), cell(createAnimationSelectPane()), cell(typeContentPane)).getComponent());
JPanel animationTypePane = new JPanel(new BorderLayout(0, 5));
animationTypePane.add(createAnimationSelectPane(), BorderLayout.NORTH);
animationTypePane.add(typeContentPane, BorderLayout.CENTER);
panel.add(periodPane, BorderLayout.CENTER);
panel.add(animationTypePane, BorderLayout.SOUTH);
panel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
return panel; return panel;
} }
protected void setContentPaneBorder() { /**
return; * 运动方式
} * @return animationSelectPane
*/
private Component createAnimationSelectPane() { private Component createAnimationSelectPane() {
JPanel panel = new JPanel(new BorderLayout(5, 0)); return FineLayoutBuilder.createHorizontalLayout(0, new double[]{1.2, 3},
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Type")); new UILabel(Toolkit.i18nText("Fine-Design_Chart_Animation_Type")), animationType);
label1.setPreferredSize(new Dimension((int) TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 20));
panel.add(label1, BorderLayout.WEST);
panel.add(animationType, BorderLayout.CENTER);
return panel;
} }
private void initTypeContentPane() { private void initTypeContentPane() {

4
designer-form/src/main/java/com/fr/design/actions/TemplateParameterAction.java

@ -1,6 +1,6 @@
package com.fr.design.actions; package com.fr.design.actions;
import com.fr.base.BaseUtils; import com.fine.theme.icon.LazyIcon;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.design.DesignModelAdapter; import com.fr.design.DesignModelAdapter;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
@ -22,7 +22,7 @@ public class TemplateParameterAction extends JTemplateAction<JForm> {
this.setMenuKeySet(KeySetUtils.REPORT_PARAMETER_ATTR); this.setMenuKeySet(KeySetUtils.REPORT_PARAMETER_ATTR);
this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/p.png")); this.setSmallIcon(new LazyIcon("param"));
} }
@Override @Override

3
designer-form/src/main/java/com/fr/design/actions/file/export/EmbeddedFormExportExportAction.java

@ -1,5 +1,6 @@
package com.fr.design.actions.file.export; package com.fr.design.actions.file.export;
import com.fine.theme.icon.LazyIcon;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.extension.FileExtension; import com.fr.base.extension.FileExtension;
@ -30,7 +31,7 @@ public class EmbeddedFormExportExportAction extends AbstractExportAction<JForm>
this.setMenuKeySet(KeySetUtils.EMBEDDED_EXPORT); this.setMenuKeySet(KeySetUtils.EMBEDDED_EXPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/oem/logo.png")); this.setSmallIcon(new LazyIcon("logo"));
} }
@Override @Override

4
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveCustomAction.java

@ -1,7 +1,7 @@
package com.fr.design.designer.creator.cardlayout; package com.fr.design.designer.creator.cardlayout;
import com.fine.theme.icon.LazyIcon;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.general.IOUtils;
/** /**
* Created by zhouping on 2017/2/9. * Created by zhouping on 2017/2/9.
@ -11,7 +11,7 @@ public class TabMoveCustomAction extends TabMoveAction {
public TabMoveCustomAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { public TabMoveCustomAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
super(t, xCardSwitchButton); super(t, xCardSwitchButton);
this.setName(""); this.setName("");
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/refresh.png")); this.setSmallIcon(new LazyIcon("refresh"));
} }
} }

4
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java

@ -1,9 +1,9 @@
package com.fr.design.designer.creator.cardlayout; package com.fr.design.designer.creator.cardlayout;
import com.fine.theme.icon.LazyIcon;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.CardSwitchButton;
import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.form.ui.container.cardlayout.WTabFitLayout;
import com.fr.general.IOUtils;
/** /**
@ -14,7 +14,7 @@ public class TabMoveNextAction extends TabMoveAction {
public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
super(t, xCardSwitchButton); super(t, xCardSwitchButton);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_Next")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_Next"));
this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/next.png")); this.setSmallIcon(new LazyIcon("triangle_right"));
} }
@Override @Override

3
designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java

@ -4,6 +4,7 @@
package com.fr.design.actions.edit; package com.fr.design.actions.edit;
import com.fine.theme.icon.LazyIcon;
import com.fr.design.actions.ElementCaseAction; import com.fr.design.actions.ElementCaseAction;
import com.fr.design.mainframe.ElementCasePane; import com.fr.design.mainframe.ElementCasePane;
@ -20,7 +21,7 @@ public class DeleteAction extends ElementCaseAction {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
this.setMnemonic('D'); this.setMnemonic('D');
//Richie:删除菜单图标 //Richie:删除菜单图标
this.setSmallIcon("/com/fr/design/images/m_report/delete"); this.setSmallIcon(new LazyIcon("remove"));
// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0)); // this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
} }

3
designer-realize/src/main/java/com/fr/poly/actions/DeleteBlockAction.java

@ -3,6 +3,7 @@
*/ */
package com.fr.poly.actions; package com.fr.poly.actions;
import com.fine.theme.icon.LazyIcon;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
@ -26,7 +27,7 @@ public class DeleteBlockAction extends UpdateAction implements TemplateComponent
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
this.setMnemonic('D'); this.setMnemonic('D');
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
this.setSmallIcon("/com/fr/design/images/m_report/delete"); this.setSmallIcon(new LazyIcon("remove"));
} }
@Override @Override

Loading…
Cancel
Save