Pull request #5481: REPORT-51919 主题切换

Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x

* commit 'fc684822f2bb8fdcc6a18080aa1762ebf1977b45':
  REPORT-51919 主题切换

designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeUsingDialog.java

@@ -127,7 +127,7 @@ public class TemplateThemeUsingDialog<T extends TemplateTheme> extends TemplateT
         button.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                apply2CurrentTemplate();
+                apply2CurrentTemplate(button);
             }
         });
         return button;
@@ -149,11 +149,12 @@ public class TemplateThemeUsingDialog<T extends TemplateTheme> extends TemplateT
         super.exit();
     }
 
-    public void apply2CurrentTemplate() {
+    private void apply2CurrentTemplate(UIButton usingCurrentThemeButton) {
         TemplateTheme theme = themeListPane.getSelectedTheme();
         if (theme != null) {
             currentTemplate.setTemplateTheme(theme);
             themeListPane.repaint();
+            usingCurrentThemeButton.setEnabled(false);
         }
     }
 }

designer-form/src/main/java/com/fr/design/fit/attrpane/FRAbsoluteBodyLayoutExtendDefinePane.java

@@ -2,6 +2,8 @@ package com.fr.design.fit.attrpane;
 
 import com.fr.base.io.IOFile;
 import com.fr.base.iofile.attr.WatermarkAttr;
+import com.fr.base.theme.FormTheme;
+import com.fr.base.theme.TemplateTheme;
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
@@ -11,19 +13,23 @@ import com.fr.design.designer.properties.items.Item;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.style.FollowingThemePane;
+import com.fr.design.gui.xpane.LayoutStylePane;
+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.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.accessibles.AccessibleBodyWatermarkEditor;
-import com.fr.design.mainframe.widget.accessibles.AccessibleWLayoutBorderStyleEditor;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
+import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
 import com.fr.design.widget.ui.designer.layout.FRAbsoluteLayoutDefinePane;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WBodyLayoutType;
+import com.fr.general.act.BorderPacker;
 import com.fr.report.core.ReportUtils;
 
 import javax.swing.BorderFactory;
@@ -38,7 +44,8 @@ import java.awt.Component;
 public class FRAbsoluteBodyLayoutExtendDefinePane extends FRAbsoluteLayoutDefinePane {
     private static final int MAX_LABEL_WIDTH = 80;
 
-    private AccessibleWLayoutBorderStyleEditor borderStyleEditor;
+    protected FollowingThemePane themePane;
+    private LayoutStylePane stylePane;
     private AccessibleBodyWatermarkEditor watermarkEditor;
 
     private UIComboBox layoutCombox;
@@ -50,51 +57,80 @@ public class FRAbsoluteBodyLayoutExtendDefinePane extends FRAbsoluteLayoutDefine
 
 
     public void initComponent() {
-        initCenterPane();
+        initUIComboBox();
-        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        borderStyleEditor = new AccessibleWLayoutBorderStyleEditor();
+
+        JPanel panel1 = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        this.add(panel1, BorderLayout.CENTER);
+
+        UIExpandablePane scalePane = new UIExpandablePane(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Area_Scaling"),
+                280, 20,
+                createAreaScalePane()
+        );
+        panel1.add(scalePane, BorderLayout.NORTH);
+
+        UIExpandablePane advancedPane = new UIExpandablePane(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"),
+                280, 20,
+                this.createAdvancePane());
+        panel1.add(advancedPane, BorderLayout.CENTER);
+
+    }
+
+    public JPanel createAdvancePane() {
+        JPanel advancedContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+
+        themePane = new FollowingThemePane(Toolkit.i18nText("Fine-Design_Form_Widget_Style_Setting"));
+        stylePane = new LayoutStylePane();
+        themePane.addFollowThemePane(stylePane, new FollowingThemePane.FollowingThemeActionChangeListener() {
+            @Override
+            public void onFollowingTheme(boolean following) {
+                stylePane.supportBodyStyle(!following);
+
+                BorderPacker style = stylePane.updateBean();
+                if (following) {
+                    TemplateTheme theme = themePane.getUsingTheme();
+                    if (theme instanceof FormTheme) {
+                        style = ((FormTheme) theme).getBodyStyle().merge(style);
+                    }
+                }
+                stylePane.populateBean((LayoutBorderStyle) style);
+            }
+        });
+        advancedContentPane.add(themePane, BorderLayout.NORTH);
+
         watermarkEditor = new AccessibleBodyWatermarkEditor();
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
+        JPanel watermarkPane = TableLayoutHelper.createGapTableLayoutPane(
                 new Component[][]{
-                        new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), borderStyleEditor},
                         new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), watermarkEditor}
                 }, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
-        JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        watermarkPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
-        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        advancedContentPane.add(watermarkPane, BorderLayout.CENTER);
-        borderPane.add(jPanel, BorderLayout.CENTER);
-        UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, borderPane);
-        centerPane.add(advancedPane, BorderLayout.NORTH);
-        this.add(centerPane, BorderLayout.NORTH);
-    }
-
-    private void initCenterPane(){
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        initUIComboBox();
-        JPanel thirdPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        JPanel jPanel = createThirdPane();
-        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
-        thirdPane.add(jPanel, BorderLayout.CENTER);
-        UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"), 280, 20, thirdPane);
-        this.add(layoutExpandablePane, BorderLayout.CENTER);
 
+        return advancedContentPane;
     }
 
-    public JPanel createThirdPane() {
+    public JPanel createAreaScalePane() {
         initLayoutComboBox();
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double[] rowSize = {p};
-        double[] colSize = {p, f};
 
         UILabel layoutTypeLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type"));
-        JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(
+        UILabel scaleModeLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode"));
+
+        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(
                 new Component[][]{
-                        new Component[]{layoutTypeLabel, UIComponentUtils.wrapWithBorderLayoutPane(layoutCombox)}},
+                        {layoutTypeLabel, layoutCombox},
-                rowSize, colSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+                        {scaleModeLabel, comboBox}
-        jPanel.add(northPane, BorderLayout.NORTH);
+                },
-        return jPanel;
+                TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+
+        contentPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
+
+        JPanel containerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        containerPane.add(contentPane, BorderLayout.CENTER);
+        containerPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 
+        return containerPane;
     }
 
     public void initLayoutComboBox() {
@@ -114,7 +150,9 @@ public class FRAbsoluteBodyLayoutExtendDefinePane extends FRAbsoluteLayoutDefine
 
     public void populateSubPane(WAbsoluteLayout ob) {
         layoutCombox.setSelectedIndex(1);
-        borderStyleEditor.setValue(ob.getBorderStyle());
+        themePane.supportFollowingTheme(ob.supportThemed());
+        themePane.setFollowingTheme(ob.isBorderStyleFollowingTheme());
+        stylePane.populateBean((LayoutBorderStyle) ob.getBorderStyle());
         watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplate(getCurrentIOFile()));
     }
 
@@ -135,7 +173,8 @@ public class FRAbsoluteBodyLayoutExtendDefinePane extends FRAbsoluteLayoutDefine
                 copyLayoutAttr(layout, xwFitLayout.toData());
             }
         }
-        layout.setBorderStyle((LayoutBorderStyle) borderStyleEditor.getValue());
+        layout.setBorderStyleFollowingTheme(themePane.isFollowingTheme());
+        layout.setBorderStyle(stylePane.updateBean());
         updateWatermark();
         return layout;
     }

designer-form/src/main/java/com/fr/design/fit/attrpane/FRFitLayoutExtendDefinePane.java

@@ -1,7 +1,10 @@
 package com.fr.design.fit.attrpane;
 
+
 import com.fr.base.io.IOFile;
 import com.fr.base.iofile.attr.WatermarkAttr;
+import com.fr.base.theme.FormTheme;
+import com.fr.base.theme.TemplateTheme;
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
@@ -15,14 +18,15 @@ import com.fr.design.foldablepane.UIExpandablePane;
 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.style.FollowingThemePane;
+import com.fr.design.gui.xpane.LayoutStylePane;
+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.FormDesigner;
 import com.fr.design.mainframe.FormSelectionUtils;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.accessibles.AccessibleBodyWatermarkEditor;
-import com.fr.design.mainframe.widget.accessibles.AccessibleWLayoutBorderStyleEditor;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.design.widget.ui.designer.component.PaddingBoundPane;
@@ -34,6 +38,7 @@ import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.act.BorderPacker;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.core.ReportUtils;
 
@@ -54,7 +59,8 @@ public class FRFitLayoutExtendDefinePane extends AbstractFRLayoutDefinePane<WFit
     private UIComboBox layoutComboBox;
     private UISpinner componentIntervel;
     private PaddingBoundPane paddingBound;
-    private AccessibleWLayoutBorderStyleEditor stylePane;
+    private FollowingThemePane themePane;
+    private LayoutStylePane stylePane;
     private AccessibleBodyWatermarkEditor watermarkEditor;
 
     public FRFitLayoutExtendDefinePane(XCreator xCreator) {
@@ -67,53 +73,80 @@ public class FRFitLayoutExtendDefinePane extends AbstractFRLayoutDefinePane<WFit
 
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        UIExpandablePane layoutExpandablePane = new UIExpandablePane(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"),
+                280, 20,
+                createLayoutPane()
+        );
+        this.add(layoutExpandablePane, BorderLayout.NORTH);
+
         JPanel advancePane = createAdvancePane();
-        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane);
+        UIExpandablePane advanceExpandablePane = new UIExpandablePane(
-        this.add(advanceExpandablePane, BorderLayout.NORTH);
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"),
-        UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"), 280, 20, createLayoutPane());
+                280, 20,
-        this.add(layoutExpandablePane, BorderLayout.CENTER);
+                advancePane
+        );
+        this.add(advanceExpandablePane, BorderLayout.CENTER);
     }
 
     public JPanel createAdvancePane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel contentPane0 = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        stylePane = new AccessibleWLayoutBorderStyleEditor();
+
+        themePane = new FollowingThemePane(Toolkit.i18nText("Fine-Design_Form_Widget_Style_Setting"));
+        stylePane = new LayoutStylePane();
+        themePane.addFollowThemePane(stylePane, new FollowingThemePane.FollowingThemeActionChangeListener() {
+            @Override
+            public void onFollowingTheme(boolean following) {
+                stylePane.supportBodyStyle(!following);
+
+                BorderPacker style = stylePane.updateBean();
+                if (following) {
+                    TemplateTheme theme = themePane.getUsingTheme();
+                    if (theme instanceof FormTheme) {
+                        style = ((FormTheme) theme).getBodyStyle().merge(style);
+                    }
+                }
+                stylePane.populateBean((LayoutBorderStyle) style);
+            }
+        });
+        contentPane0.add(themePane, BorderLayout.NORTH);
+
+        JPanel contentPane1 = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        contentPane0.add(contentPane1, BorderLayout.CENTER);
+
         watermarkEditor = new AccessibleBodyWatermarkEditor();
-        paddingBound = new PaddingBoundPane();
+        JPanel waterMarkPane = TableLayoutHelper.createGapTableLayoutPane(
-        JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(
                 new Component[][]{
-                        new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), stylePane},
                         new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), watermarkEditor}
                 }, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
-        jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+        waterMarkPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
-        jPanel.add(paddingBound, BorderLayout.CENTER);
+        contentPane1.add(waterMarkPane, BorderLayout.NORTH);
-        jPanel.add(jp2, BorderLayout.NORTH);
+
-        return jPanel;
+        paddingBound = new PaddingBoundPane();
+        contentPane1.add(paddingBound, BorderLayout.CENTER);
+
+        return contentPane0;
     }
 
     public JPanel createLayoutPane() {
-        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel containerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+
         layoutComboBox = initUIComboBox(FRLayoutTypeItems.ITEMS);
         componentIntervel = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
         JPanel componentIntervelPane = UIComponentUtils.wrapWithBorderLayoutPane(componentIntervel);
 
         UILabel intervalLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Interval"));
 
-        double f = TableLayout.FILL;
+        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(
-        double p = TableLayout.PREFERRED;
+                new Component[][]{
-        double[] rowSize = {p, p};
+                        {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type")), layoutComboBox},
-        double[] columnSize = {p, f};
+                        {intervalLabel, componentIntervelPane}
-        int[][] rowCount = {{1, 1}, {1, 1}};
+                },
-
+                TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+        contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
+        containerPane.add(contentPane, BorderLayout.CENTER);
 
-        Component[][] components = new Component[][]{
+        return containerPane;
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type")), layoutComboBox},
-                new Component[]{intervalLabel, componentIntervelPane}
-        };
-        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
-        centerPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
-        jPanel.add(centerPane, BorderLayout.CENTER);
-        return jPanel;
     }
 
 
@@ -144,7 +177,9 @@ public class FRFitLayoutExtendDefinePane extends AbstractFRLayoutDefinePane<WFit
         paddingBound.populate(ob);
         layoutComboBox.setSelectedIndex(ob.getBodyLayoutType().getTypeValue());
         componentIntervel.setValue(ob.getCompInterval());
-        stylePane.setValue(ob.getBorderStyle());
+        themePane.supportFollowingTheme(ob.supportThemed());
+        themePane.setFollowingTheme(ob.isBorderStyleFollowingTheme());
+        stylePane.populateBean((LayoutBorderStyle) ob.getBorderStyle());
         watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplate(getCurrentIOFile()));
     }
 
@@ -163,7 +198,8 @@ public class FRFitLayoutExtendDefinePane extends AbstractFRLayoutDefinePane<WFit
         if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"))) {
             paddingBound.update(layout);
         }
-        LayoutBorderStyle borderStyle = (LayoutBorderStyle) stylePane.getValue();
+        layout.setBorderStyleFollowingTheme(themePane.isFollowingTheme());
+        LayoutBorderStyle borderStyle = stylePane.updateBean();
         if (borderStyle != null) {
             layout.setBorderStyle(borderStyle);
         }