Merge remote-tracking branch 'origin/release/9.0' into release/9.0

designer_base/src/com/fr/design/constants/UIConstants.java

@@ -110,6 +110,7 @@ public interface UIConstants {
     public static final Color TAB_BUTTON_HOVER_SELECTED = new Color(239, 238, 243);
     public static final Color TAB_BUTTON_PRESS = new Color(228, 227, 232);
     public static final Color TAB_BUTTON_PRESS_SELECTED = new Color(236, 236, 238);
+    public static final Color POPUP_TITLE_BACKGROUND = new Color(0xd8f2fd);
 
 
 

designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java

@@ -37,6 +37,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
     protected CardLayout cardLayout;
     protected JPanel cardPane;
     protected BasePlot plot;
+    private static final int TOP_TOOLBAR_HEIGHT = 24;
 
     public UIControlPane() {
         this.initComponentPane();
@@ -192,11 +193,10 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
         topToolBar.setLayout(new BorderLayout());
         ShortCut addItem = addItemShortCut().getShortCut();
         addItem.intoJToolBar(topToolBar);
-        topToolBar.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = { p, f};
-        double[] rowSize = {p};
+        double[] rowSize = {TOP_TOOLBAR_HEIGHT};
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(getAddItemText()), topToolBar},
         };

designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java

@@ -308,7 +308,7 @@ public class UIEastResizableContainer extends JPanel {
                 }
             }
 //                g.drawImage(button, 2, ARROW_MARGIN_VERTICAL, 5, toolPaneHeight, null);
-            g.drawImage(button, 18, 9, 5, 5, null);
+            g.drawImage(button, 18, 7, 5, 10, null);
         }
     }
 

designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -502,7 +502,7 @@ public class UIResizableContainer extends JPanel {
                         button = UIConstants.DRAG_LEFT_PRESS;
                     }
                 }
-                g.drawImage(button, 3, ARROW_MARGIN_VERTICAL, 5, 5, null);
+                g.drawImage(button, 3, ARROW_MARGIN_VERTICAL, 5, toolPaneHeight, null);
             } else {
                 g.drawImage(UIConstants.DRAG_BAR, 0, 0, toolPaneHeight, getHeight(), null);
                 if (containerWidth == toolPaneHeight) {

designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -852,6 +852,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
                 } else if (isMovable) {
                     setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+                    setBackground(UIConstants.POPUP_TITLE_BACKGROUND);
                 } else {
                     setCursor(Cursor.getDefaultCursor());
                 }

designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java

@@ -37,12 +37,9 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane
 		valueBox = new UIComboBox();
 		filterPane = new ChartDataFilterPane(new MeterPlot(), parent);
 
-		nameBox.setPreferredSize(new Dimension(100, 20));
-		valueBox.setPreferredSize(new Dimension(100, 20));
-
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
-		double[] columnSize = { p,f};
+		double[] columnSize = {f, COMPONENT_WIDTH};
 		double[] rowSize = {p, p};
 
         Component[][] components = createComponents();

designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java

@@ -216,7 +216,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (valueFormatPane == null) {
-                    valueFormatPane = new FormatPane();
+                    valueFormatPane = new FormatPaneWithOutFont();
                 }
                 Point comPoint = dataPointValueFormat.getLocationOnScreen();
                 Point arrowPoint = new Point(comPoint.x - DET, comPoint.y + dataPointValueFormat.getHeight());

designer_chart/src/com/fr/plugin/chart/designer/other/VanChartInteractivePane.java

@@ -111,7 +111,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             return null;
         }
         zoomWidget = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")});
-        zoomResize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")});
+        zoomResize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Change"), Inter.getLocText("Plugin-ChartF_Non_Adjustment")});
         from = new TinyFormulaPane();
         to = new TinyFormulaPane();
         zoomType = new UIButtonGroup(getNameArray(), getValueArray());

designer_chart/src/com/fr/plugin/chart/designer/style/tooltip/VanChartTooltipPane.java

@@ -58,12 +58,12 @@ public class VanChartTooltipPane extends AbstractVanChartScrollPane<Chart> {
         if(chart == null) {
             return;
         }
-        ConditionAttr attrList = chart.getPlot().getConditionCollection().getDefaultAttr();
+        AttrTooltip attrTooltip = tooltipPane.update();
         DataSeriesCondition attr = ((VanChartPlot)chart.getPlot()).getAttrTooltipFromConditionCollection();
+        ConditionAttr attrList = chart.getPlot().getConditionCollection().getDefaultAttr();
         if(attr != null) {
             attrList.remove(attr);
         }
-        AttrTooltip attrTooltip = tooltipPane.update();
         if (attrTooltip != null) {
             attrList.addDataSeriesCondition(attrTooltip);
         }

designer_chart/src/com/fr/plugin/chart/structure/desinger/data/StructurePlotTableDataContentPane.java

@@ -31,7 +31,7 @@ public class StructurePlotTableDataContentPane extends AbstractTableDataContentP
     public StructurePlotTableDataContentPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {p, f};
+        double[] columnSize = {f, COMPONENT_WIDTH};
         double[] rowSize = {p, p, p, p, p, p};
 
         nodeName = new UIComboBox();

designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java

@@ -148,5 +148,13 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 	public boolean supportSetVisibleOrEnable(){
 		return false;
 	}
+
+	/**
+	 * data属性改变触发其他操作
+	 *
+	 */
+	public void firePropertyChange(){
+		initStyle();
+	}
     
 }

designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java

@@ -92,6 +92,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 	public void refreshDockingView() {
 		FormDesigner formDesigner = this.getEditingFormDesigner();
 		removeAll();
+		changeVarNameAction = null;
 		if(this.componentTree != null) {
 			this.componentTree.removeAll();
 		}
@@ -156,10 +157,10 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
 	protected ShortCut4JControlPane[] createShortcuts() {
         ArrayList<ShortCut4JControlPane> shortCutList = new ArrayList<>();
         FormDesigner designer = getEditingFormDesigner();
-        if (changeVarNameAction == null) {
-            changeVarNameAction = new ChangeNameAction(designer);
-        }
-        shortCutList.add(new WidgetEnableShortCut(changeVarNameAction));
+		if (changeVarNameAction == null) {
+			changeVarNameAction = new ChangeNameAction(designer);
+		}
+		shortCutList.add(new WidgetEnableShortCut(changeVarNameAction));
         for (Action action : designer.getActions()) {
             shortCutList.add(new WidgetEnableShortCut((UndoableAction)action));
         }

designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -8,7 +8,6 @@ import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.widget.DataModify;
 import com.fr.design.widget.Operator;
@@ -152,8 +151,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
 
     private void initDefinePane() {
         currentEditorDefinePane = null;
-        boolean dedicateLayout = xCreator.acceptType(XWScaleLayout.class) && xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator() || xCreator.acceptType(XWTitleLayout.class);
-        XCreator creator = dedicateLayout ? (XCreator) xCreator.getComponent(0) : xCreator;
+        XCreator creator = getXCreatorDedicated();
         FormWidgetDefinePaneFactoryBase.RN rn = FormWidgetDefinePaneFactoryBase.createWidgetDefinePane(creator, creator.toData(), new Operator() {
             @Override
             public void did(DataCreatorUI ui, String cardName) {
@@ -168,6 +166,10 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         currentEditorDefinePane = definePane;
     }
 
+    private XCreator getXCreatorDedicated(){
+        boolean dedicateLayout = xCreator.acceptType(XWScaleLayout.class) && xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator() || xCreator.acceptType(XWTitleLayout.class);
+        return dedicateLayout ? (XCreator) xCreator.getComponent(0) : xCreator;
+    }
 
     @Override
     public String title4PopupWindow() {
@@ -217,7 +219,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     }
 
     public void fireValueChanged() {
-        xCreator.firePropertyChange();
+        XCreator creator = getXCreatorDedicated();
+        creator.firePropertyChange();
         designer.fireTargetModified();
         designer.refreshDesignerUI();
     }