vcs版本管理关闭其他所有模板时保存模板时版本不更新问题修改

designer-base/src/main/java/com/fr/design/gui/controlpane/UINameableListCellRenderer.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.controlpane;
 
 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;
@@ -43,7 +44,7 @@ public class UINameableListCellRenderer extends
     private void initComponents() {
         editButton = new UILabel() {
             public Dimension getPreferredSize() {
-                return new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT);
+                return FineUIScale.scale(new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT));
             }
         };
         editButton.setIcon(isNewStyle ? LIST_EDIT_ICON : CPT_ICON);

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;
         }
 

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"));
+        bold = new UIToggleButton(new LazyIcon("bold"));
-        italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
+        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());
+        JPanel buttonPane = new JPanel();
-        buttonPane.add(fontSizeComboBox, BorderLayout.CENTER);
+        buttonPane.add(GUICoreUtils.createFlowPane(components, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE));
-        buttonPane.add(GUICoreUtils.createFlowPane(components, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST);
 
         this.setLayout(new BorderLayout());
         this.add(getContentPane(buttonPane), BorderLayout.CENTER);
@@ -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() {

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.chart.series.SeriesCondition.impl;
 
+import com.fine.theme.utils.FineUIScale;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
@@ -30,7 +31,7 @@ import java.util.HashMap;
  */
 public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPoplink> {
     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<ChartHyperPopli
         ChartCollection cc = createChartCollection();
 
         chartComponent = new ChartComponent();
-        chartComponent.setPreferredSize(new Dimension((int) this.getPreferredSize().getWidth() - EDIT_PANE_WIDTH, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+        chartComponent.setPreferredSize(new Dimension((int) this.getPreferredSize().getWidth() - EDIT_PANE_WIDTH, FineUIScale.scale(170)));// 在单元格弹出时 需要调整保证属性表的大小.
         chartComponent.setSupportEdit(false);
         chartComponent.populate(cc);
 

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() {

designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@@ -86,8 +86,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
     private static final int PARA_IMAGE_SHIFT_X = -4;
     private static final int FORM_AREA_PADDING_LEFT = 13;
 
-    private UpdateAction[] mainActions;
-
     private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png");
 
     public FormParaDesigner() {
@@ -344,16 +342,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
         return designerActions.toArray(new UpdateAction[designerActions.size()]);
     }
 
-    public UpdateAction[] getMainActions() {
-        if (mainActions == null) {
-            mainActions = new UpdateAction[]{new CutAction(this), new CopyAction(this), new PasteAction(this),
-                    new FormDeleteAction(this)};
-        }
-        return mainActions;
-    }
-
-
-
     private boolean searchQueryCreators(XLayoutContainer rootContainer) {
         boolean b = false;
         for (int i = 0; i < rootContainer.getXCreatorCount(); i++) {
@@ -748,12 +736,8 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
      * @return 按钮组 a
      */
     public JComponent[] toolBarButton4Form() {
-        UpdateAction[] actions = getMainActions();
+        return new JComponent[]{new CutAction(this).createToolBarComponent(), new CopyAction(this).createToolBarComponent(), new PasteAction(this).createToolBarComponent(),
-        JComponent[] components = new JComponent[actions.length];
+                new FormDeleteAction(this).createToolBarComponent()};
-        for (int i = 0; i < actions.length; i++) {
-            components[i] = actions[i].createToolBarComponent();
-        }
-        return components;
     }
 
     @Override

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -776,9 +776,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
                     for (UpdateAction action : getActions()) {
                         action.update();
                     }
-                    for (UpdateAction action : getMainActions()) {
-                        action.update();
-                    }
                 }
             }
 
@@ -1482,10 +1479,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         return designerActions.toArray(new UpdateAction[designerActions.size()]);
     }
 
-    public UpdateAction[] getMainActions() {
-        return new UpdateAction[]{};
-    }
-
     private List<UpdateAction> getBasicActions(){
         if (basicActions == null) {
             basicActions = new ArrayList<UpdateAction>();

designer-realize/src/main/java/com/fr/design/widget/WidgetManageCardPane.java

@@ -5,7 +5,7 @@ import com.fr.design.mainframe.ElementCasePane;
 /**
  * Created by kerry on 2017/8/29.
  */
-public class WidgetManageCardPane extends CellWidgetCardPane{
+public class WidgetManageCardPane extends EastCellWidgetCardPane{
 
     public WidgetManageCardPane(ElementCasePane pane) {
         super(pane);

designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java

@@ -104,7 +104,7 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
     }
 
     protected CellWidgetCardPane initWidgetCardPane(ElementCasePane pane) {
-        return eastRegion ? new EastCellWidgetCardPane(pane) : new CellWidgetCardPane(pane);
+        return new EastCellWidgetCardPane(pane);
     }
 
     protected JPanel createContentPane() {