From 8e34056d1ab20e38a0f353f2b7433ef2fc002e72 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Tue, 25 Jul 2017 18:00:05 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-2897=209.0=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8D=95=E5=85=83=E6=A0=BC=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7-=E6=A0=B7=E5=BC=8F=3D=E3=80=8B=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=A0=B7=E5=BC=8F=3D=E3=80=8B=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E3=80=81=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cell/settingpane/CellExpandAttrPane.java  |  15 -
 .../settingpane/style/CustomStylePane.java    | 287 ++++----
 .../design/gui/ibutton/FiveButtonLayout.java  |  22 +-
 .../com/fr/design/gui/ibutton/UITabGroup.java |   2 +-
 .../fr/design/gui/style/AlignmentPane.java    | 686 +++++++++---------
 .../com/fr/design/gui/style/BorderPane.java   | 386 +++++-----
 .../com/fr/design/gui/style/FRFontPane.java   |  47 +-
 .../com/fr/design/gui/style/FormatPane.java   |  55 +-
 .../com/fr/design/locale/designer.properties  |  17 +
 .../design/locale/designer_en_US.properties   |  17 +
 .../design/locale/designer_ja_JP.properties   |  58 +-
 .../design/locale/designer_ko_KR.properties   |  56 +-
 .../design/locale/designer_zh_CN.properties   |  17 +
 .../design/locale/designer_zh_TW.properties   |  58 +-
 14 files changed, 913 insertions(+), 810 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
index 128c01418..3ca8bff0c 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
@@ -89,21 +89,6 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
 		layoutPane.add(basicPane,BorderLayout.NORTH);
 		layoutPane.add(seniorPane,BorderLayout.CENTER);
 		return layoutPane;
-//		double f = TableLayout.FILL;
-//		double p = TableLayout.PREFERRED;
-//		Component[][] components = new Component[][]{
-//				new Component[]{new UILabel(Inter.getLocText("ExpandD-Expand_Direction") + ":", SwingConstants.RIGHT), expandDirectionButton},
-//				new Component[]{new UILabel(Inter.getLocText("LeftParent") + ":", SwingConstants.RIGHT), leftFatherPane},
-//				new Component[]{new UILabel(Inter.getLocText("ExpandD-Up_Father_Cell") + ":", SwingConstants.RIGHT), rightFatherPane},
-//				new Component[]{new JSeparator(), null},
-//				new Component[]{new UILabel(Inter.getLocText("ExpandD-Expandable") + ":", SwingConstants.RIGHT), horizontalExpandableCheckBox},
-//				new Component[]{null, verticalExpandableCheckBox},
-//				new Component[]{new UILabel(Inter.getLocText("ExpandD-Sort_After_Expand") + ":", SwingConstants.RIGHT), sortAfterExpand},
-//		};
-//		double[] rowSize = {p, p, p, p, p, p, p, p, p, p, p, p, p};
-//		double[] columnSize = {p, f};
-//		int[][] rowCount = {{1, 1}, {1, 3}, {1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 3}};
-//		return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
 	}
 
 	private JPanel basicPane(){
diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
index 7caadd105..019417c09 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
@@ -1,29 +1,25 @@
 package com.fr.design.mainframe.cell.settingpane.style;
 
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.event.ChangeListener;
-
 import com.fr.base.CellBorderStyle;
 import com.fr.base.NameStyle;
 import com.fr.base.Style;
 import com.fr.design.actions.utils.ReportActionUtils;
-import com.fr.design.gui.ibutton.FiveButtonLayout;
-import com.fr.design.gui.style.AbstractBasicStylePane;
-import com.fr.design.gui.style.AlignmentPane;
-import com.fr.design.gui.style.BackgroundPane;
-import com.fr.design.gui.style.BorderPane;
-import com.fr.design.gui.style.FRFontPane;
-import com.fr.design.gui.style.FormatPane;
-import com.fr.design.style.BorderUtils;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.MultiTabPane;
-import com.fr.general.Inter;
+import com.fr.design.gui.ibutton.FiveButtonLayout;
+import com.fr.design.gui.style.*;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.style.BorderUtils;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
 import com.fr.stable.Constants;
 
+import javax.swing.*;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * 哎，复杂的原型图导致复杂的画法。非我所愿也
@@ -32,130 +28,143 @@ import com.fr.stable.Constants;
  * @since 2012-5-24上午10:36:10
  */
 public class CustomStylePane extends MultiTabPane<Style> {
-	private static final int LENGTH_FOUR = 4;
-	private static final int THREE_INDEX = 3;
-	private String[] NameArray;
-	private ElementCasePane reportPane;
-	private BackgroundPane backgroundPane = null;
-
-
-	public CustomStylePane() {
-		super();
-		tabPane.setOneLineTab(false);
-		tabPane.setLayout(new FiveButtonLayout());
-	}
-
-	/**
-	 * @return
-	 */
-	public String title4PopupWindow() {
-		return Inter.getLocText(new String[]{"Custom", "Style"});
-	}
-
-	/**
-	 * for ScrollBar
-	 *
-	 * @param l
-	 */
-	public void addTabChangeListener(ChangeListener l) {
-		if (tabPane != null) {
-			tabPane.addChangeListener(l);
-		}
-		if (backgroundPane != null) {
-			backgroundPane.addChangeListener(l);
-		}
-	}
-
-	/**
-	 *
-	 */
-	public void reset() {
-		populateBean(null);
-	}
-
-	@Override
-	/**
-	 *
-	 */
-	public void populateBean(Style ob) {
-		for (int i = 0; i < paneList.size(); i++) {
-			((AbstractBasicStylePane) paneList.get(i)).populateBean(ob);
-		}
-	}
-
-	@Override
-	/**
-	 *
-	 */
-	public Style updateBean() {
-		return updateStyle(ReportActionUtils.getCurrentStyle(reportPane));
-	}
-
-	/**
-	 * @param style
-	 * @return
-	 */
-	public Style updateStyle(Style style) {
-		return ((AbstractBasicStylePane) paneList.get(tabPane.getSelectedIndex())).update(style);//只更新当前选中面板的样式
-	}
-
-
-	public boolean isBorderPaneSelected() {
-		return tabPane.getSelectedIndex() == THREE_INDEX ;
-	}
-
-	/**
-	 * @param ePane
-	 */
-	public void dealWithBorder(ElementCasePane ePane) {
-		this.reportPane = ePane;
-		Object[] fourObjectArray = BorderUtils.createCellBorderObject(reportPane);
-
-		if (fourObjectArray != null && fourObjectArray.length % LENGTH_FOUR == 0) {
-			if (fourObjectArray.length == LENGTH_FOUR) {
-				((BorderPane) paneList.get(THREE_INDEX)).populateBean((CellBorderStyle) fourObjectArray[0], ((Boolean) fourObjectArray[1]).booleanValue(), ((Integer) fourObjectArray[2]).intValue(),
-						(Color) fourObjectArray[THREE_INDEX]);
-			} else {
-				((BorderPane) paneList.get(THREE_INDEX)).populateBean(new CellBorderStyle(), Boolean.TRUE, Constants.LINE_NONE,
-						(Color) fourObjectArray[THREE_INDEX]);
-			}
-		}
-
-	}
-
-	/**
-	 *
-	 */
-	public void updateBorder() {
-		BorderUtils.update(reportPane, ((BorderPane) paneList.get(THREE_INDEX)).update());
-	}
-
-	/**
-	 * @param ob
-	 * @return
-	 */
-	public boolean accept(Object ob) {
-		return ob instanceof Style && !(ob instanceof NameStyle);
-	}
-
-	@Override
-	protected List<BasicPane> initPaneList() {
-		paneList = new ArrayList<BasicPane>();
-		paneList.add(new FormatPane());
-		paneList.add(new AlignmentPane());
-		paneList.add(new FRFontPane());
-		paneList.add(new BorderPane());
-		paneList.add(backgroundPane = new BackgroundPane());
-		return paneList;
-	}
-
-	@Override
-	/**
-	 *
-	 */
-	public void updateBean(Style ob) {
-
-	}
+    private static final int LENGTH_FOUR = 4;
+    private static final int THREE_INDEX = 3;
+    private static final int TWO_INDEX = 2;
+    private static final int ONE_INDEX = 1;
+    private String[] NameArray;
+    private ElementCasePane reportPane;
+    private BackgroundPane backgroundPane = null;
+
+
+    public CustomStylePane() {
+        super();
+        tabPane.setOneLineTab(true);
+        tabPane.setLayout(new FiveButtonLayout(1));
+    }
+
+    public static void main(String[] args) {
+        JFrame jf = new JFrame("test");
+        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        JPanel content = (JPanel) jf.getContentPane();
+        content.setLayout(new BorderLayout());
+        content.add(new CustomStylePane(), BorderLayout.CENTER);
+        GUICoreUtils.centerWindow(jf);
+        jf.setSize(290, 400);
+        jf.setVisible(true);
+    }
+
+    /**
+     * @return
+     */
+    public String title4PopupWindow() {
+        return Inter.getLocText(new String[]{"Custom", "Style"});
+    }
+
+    /**
+     * for ScrollBar
+     *
+     * @param l
+     */
+    public void addTabChangeListener(ChangeListener l) {
+        if (tabPane != null) {
+            tabPane.addChangeListener(l);
+        }
+        if (backgroundPane != null) {
+            backgroundPane.addChangeListener(l);
+        }
+    }
+
+    /**
+     *
+     */
+    public void reset() {
+        populateBean(null);
+    }
+
+    @Override
+    /**
+     *
+     */
+    public void populateBean(Style ob) {
+        for (int i = 0; i < paneList.size(); i++) {
+            ((AbstractBasicStylePane) paneList.get(i)).populateBean(ob);
+        }
+    }
+
+    @Override
+    /**
+     *
+     */
+    public Style updateBean() {
+        return updateStyle(ReportActionUtils.getCurrentStyle(reportPane));
+    }
+
+    /**
+     * @param style
+     * @return
+     */
+    public Style updateStyle(Style style) {
+        return ((AbstractBasicStylePane) paneList.get(tabPane.getSelectedIndex())).update(style);//只更新当前选中面板的样式
+    }
+
+
+    public boolean isBorderPaneSelected() {
+        return tabPane.getSelectedIndex() == TWO_INDEX;
+    }
+
+    /**
+     * @param ePane
+     */
+    public void dealWithBorder(ElementCasePane ePane) {
+        this.reportPane = ePane;
+        Object[] fourObjectArray = BorderUtils.createCellBorderObject(reportPane);
+
+        if (fourObjectArray != null && fourObjectArray.length % LENGTH_FOUR == 0) {
+            if (fourObjectArray.length == LENGTH_FOUR) {
+                ((BorderPane) paneList.get(ONE_INDEX)).populateBean((CellBorderStyle) fourObjectArray[0], ((Boolean) fourObjectArray[1]).booleanValue(), ((Integer) fourObjectArray[2]).intValue(),
+                        (Color) fourObjectArray[THREE_INDEX]);
+            } else {
+                ((BorderPane) paneList.get(ONE_INDEX)).populateBean(new CellBorderStyle(), Boolean.TRUE, Constants.LINE_NONE,
+                        (Color) fourObjectArray[THREE_INDEX]);
+            }
+        }
+
+    }
+
+    /**
+     *
+     */
+    public void updateBorder() {
+        BorderUtils.update(reportPane, ((BorderPane) paneList.get(TWO_INDEX)).update());
+    }
+
+    /**
+     * @param ob
+     * @return
+     */
+    public boolean accept(Object ob) {
+        return ob instanceof Style && !(ob instanceof NameStyle);
+    }
+
+    @Override
+    protected List<BasicPane> initPaneList() {
+        paneList = new ArrayList<BasicPane>();
+        paneList.add(new FormatPane());
+        paneList.add(new BorderPane());
+        paneList.add(new AlignmentPane());
+//		paneList.add(new FRFontPane());
+//		paneList.add(backgroundPane = new BackgroundPane());
+        return paneList;
+    }
+
+    @Override
+    /**
+     *
+     */
+    public void updateBean(Style ob) {
+
+    }
 
 
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/gui/ibutton/FiveButtonLayout.java b/designer_base/src/com/fr/design/gui/ibutton/FiveButtonLayout.java
index 97f68e7fa..def565efd 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/FiveButtonLayout.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/FiveButtonLayout.java
@@ -12,20 +12,26 @@ import java.awt.*;
 public class FiveButtonLayout extends GridLayout {
     private static final double SECOND_ROW = 1.25;
 
-    public FiveButtonLayout () {
-        super(2, 3, 1, 1);
+    public FiveButtonLayout(int rows) {
+        super(rows, 3, 1, 1);
     }
 
     /**
      * 容器布局
+     *
      * @param parent 容器
      */
     public void layoutContainer(Container parent) {
-        synchronized(parent.getTreeLock()) {
+        synchronized (parent.getTreeLock()) {
             Insets insets = parent.getInsets();
             int ncomponents = parent.getComponentCount();
             int nrows = 2;
             int ncols = 3;
+            if (ncomponents == 3) {
+                nrows = 1;
+                ncols = 3;
+            }
+
             if (ncomponents == 0) {
                 return;
             }
@@ -36,14 +42,14 @@ public class FiveButtonLayout extends GridLayout {
             }
             int w = parent.getWidth() - (insets.left + insets.right);
             int h = parent.getHeight() - (insets.top + insets.bottom);
-            w = (w - (ncols - 1) ) / ncols;
-            h = (h - (nrows - 1) ) / nrows;
-            for (int i = 0, x = insets.left, y = insets.top; i < ncols; i ++, x += w + 1) {
+            w = (w - (ncols - 1)) / ncols;
+            h = (h - (nrows - 1)) / nrows;
+            for (int i = 0, x = insets.left, y = insets.top; i < ncols; i++, x += w + 1) {
                 parent.getComponent(i).setBounds(x, y, w, h);
             }
             int line2w = (int) (SECOND_ROW * w);
-            int secondRowCount = ncomponents-ncols;
-            int startx= (parent.getWidth()-line2w*secondRowCount-secondRowCount-1)/2;
+            int secondRowCount = ncomponents - ncols;
+            int startx = (parent.getWidth() - line2w * secondRowCount - secondRowCount - 1) / 2;
             for (int i = ncols, x = startx, y = insets.top + h + 1; i < ncomponents; i++, x += line2w + 1) {
                 parent.getComponent(i).setBounds(x, y, line2w, h);
             }
diff --git a/designer_base/src/com/fr/design/gui/ibutton/UITabGroup.java b/designer_base/src/com/fr/design/gui/ibutton/UITabGroup.java
index 406dc8bff..07d2c02dc 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/UITabGroup.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UITabGroup.java
@@ -39,7 +39,7 @@ public class UITabGroup extends UIButtonGroup<Integer> {
         if (number < BUTTON_NUMBER || isOneLineTab) {
             return super.getGridLayout(number);
         } else if (number == BUTTON_NUMBER || number == SEVEN_NUMBER) {
-            return new FiveButtonLayout();
+            return new FiveButtonLayout(2);
         } else {
             return new GridLayout(2, 3, 1, 1);
         }
diff --git a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java
index aff23e952..33acbab2e 100644
--- a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java
+++ b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java
@@ -7,8 +7,10 @@ package com.fr.design.gui.style;
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
+import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.fun.IndentationUnitProcessor;
 import com.fr.design.gui.frpane.UINumberDragPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
@@ -36,354 +38,378 @@ import java.util.Arrays;
  * Pane to edit cell alignment.
  */
 public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameObserver {
-	private static final int ANGEL = 90;
+    private static final int ANGEL = 90;
+    private static final Dimension SPINNER_DIMENSION = new Dimension(60, 20);
+    private static final String[] TEXT = {Inter.getLocText("FR-Designer_StyleAlignment_Wrap_Text"), Inter.getLocText("FR-Designer_StyleAlignment_Single_Line"),
+            Inter.getLocText("FR-Designer_StyleAlignment_Single_Line(Adjust_Font)"), Inter.getLocText("FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)")};
 
-	private static final String[] TEXT = {Inter.getLocText("StyleAlignment-Wrap_Text"), Inter.getLocText("StyleAlignment-Single_Line"),
-			Inter.getLocText("StyleAlignment-Single_Line(Adjust_Font)"), Inter.getLocText("StyleAlignment-Multi_Line(Adjust_Font)")};
+    private static final String[] LAYOUT = {Inter.getLocText("FR-Designer-StyleAlignment_Layout_Default"), Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Titled"),
+            Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Extend"), Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Adjust")};
 
-	private static final String[] LAYOUT = {Inter.getLocText("FR-Designer-StyleAlignment_Layout_Default"), Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Titled"),
-			Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Extend"), Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Adjust")};
+    private JPanel hPaneContainer;
+    private JPanel vPaneContainer;
+    private JPanel rotationBarCC;
+    private JPanel basicPane;
+    private JPanel seniorPane;
 
-	private JPanel hPaneContainer;
-	private JPanel vPaneContainer;
-	private JPanel rotationBarCC;
+    private UIComboBox textComboBox;
+    private UIComboBox textRotationComboBox;
+    private UIComboBox imageLayoutComboBox;
 
-	private UIComboBox textComboBox;
-	private UIComboBox textRotationComboBox;
-	private UIComboBox imageLayoutComboBox;
+    private UIButtonGroup<Integer> hAlignmentPane;// 左对齐 水平居中 右对齐 水平分散
+    private UIButtonGroup<Integer> vAlignmentPane;// 居上 垂直居中 居下
 
-	private UIButtonGroup<Integer> hAlignmentPane;// 左对齐 水平居中 右对齐 水平分散
-	private UIButtonGroup<Integer> vAlignmentPane;// 居上 垂直居中 居下
+    private UINumberDragPane rotationPane;
 
-	private UINumberDragPane rotationPane;
+    private UISpinner leftIndentSpinner;
+    private UISpinner rightIndentSpinner;
 
-	private UISpinner leftIndentSpinner;
-	private UISpinner rightIndentSpinner;
+    private UISpinner spaceBeforeSpinner;
+    private UISpinner spaceAfterSpinner;
+    private UISpinner lineSpaceSpinner;
+    private GlobalNameListener globalNameListener = null;
+    private IndentationUnitProcessor indentationUnitProcessor = null;
 
-	private UISpinner spaceBeforeSpinner;
-	private UISpinner spaceAfterSpinner;
-	private UISpinner lineSpaceSpinner;
-	private GlobalNameListener globalNameListener = null;
-	private IndentationUnitProcessor indentationUnitProcessor = null;
+    public AlignmentPane() {
+        this.initComponents();
+    }
 
-	public AlignmentPane() {
-		this.initComponents();
-	}
 
-	protected void initComponents() {
-		textComboBox = new UIComboBox(TEXT);
-		imageLayoutComboBox = new UIComboBox(LAYOUT);
+    protected void initComponents() {
+        textComboBox = new UIComboBox(TEXT);
+        imageLayoutComboBox = new UIComboBox(LAYOUT);
         initTextRotationCombox();
 
-		Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
-				BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
-				BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),
-				BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"),
-				BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")};
-		Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
-		hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
-		hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"),
-		Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Distributed"),Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")});
-		hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
-		vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
-
-		Icon[] vAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"),
-				BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"),
-				BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png")};
-		Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM};
-		vAlignmentPane = new UIButtonGroup<Integer>(vAlignmentIconArray, vAlignment);
-		vAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Top"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Bottom")});
-		initOtherComponent();
-		initAllNames();
-
-		indentationUnitProcessor = ExtraDesignClassManager.getInstance().getSingle(IndentationUnitProcessor.MARK_STRING);
-		if (null == indentationUnitProcessor){
-			indentationUnitProcessor = new DefaultIndentationUnitProcessor();
-		}
-	}
-
-
-	private void initOtherComponent() {
-		hPaneContainer.add(hAlignmentPane);
-		vPaneContainer.add(vAlignmentPane);
-		rotationPane = new UINumberDragPane(-ANGEL, ANGEL);
-
-		leftIndentSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
-		rightIndentSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
-
-		spaceBeforeSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
-		spaceAfterSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
-		lineSpaceSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
-
-		rotationBarCC = new JPanel(new CardLayout());
-		rotationBarCC.add(rotationPane, "show");
-		rotationBarCC.add(new JPanel(), "hide");
-
-		this.setLayout(new BorderLayout());
-		this.add(createPane(), BorderLayout.CENTER);
-
-		textRotationComboBox.addItemListener(new ItemListener() {
-
-			@Override
-			public void itemStateChanged(ItemEvent e) {
-				CardLayout cc = (CardLayout) rotationBarCC.getLayout();
-				cc.show(rotationBarCC, textRotationComboBox.getSelectedIndex() == 0 ? "show" : "hide");
-			}
-		});
-	}
-
-    private void initTextRotationCombox(){
+        Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
+                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
+                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),
+                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"),
+                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")};
+        Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
+        hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
+        hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"),
+                Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Distributed"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")});
+        hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+
+        Icon[] vAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"),
+                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"),
+                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png")};
+        Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM};
+        vAlignmentPane = new UIButtonGroup<Integer>(vAlignmentIconArray, vAlignment);
+        vAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Top"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Bottom")});
+        initOtherComponent();
+        initAllNames();
+
+        indentationUnitProcessor = ExtraDesignClassManager.getInstance().getSingle(IndentationUnitProcessor.MARK_STRING);
+        if (null == indentationUnitProcessor) {
+            indentationUnitProcessor = new DefaultIndentationUnitProcessor();
+        }
+    }
+
+
+    private void initOtherComponent() {
+        hPaneContainer.add(hAlignmentPane);
+        vPaneContainer.add(vAlignmentPane);
+        rotationPane = new UINumberDragPane(-ANGEL, ANGEL);
+
+        leftIndentSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
+        rightIndentSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
+
+        spaceBeforeSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
+        spaceAfterSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
+        lineSpaceSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
+
+        rotationBarCC = new JPanel(new CardLayout());
+        rotationBarCC.add(rotationPane, "show");
+        rotationBarCC.add(new JPanel(), "hide");
+
+        this.setLayout(new BorderLayout());
+        this.add(createPane(), BorderLayout.CENTER);
+
+        textRotationComboBox.addItemListener(new ItemListener() {
+
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                CardLayout cc = (CardLayout) rotationBarCC.getLayout();
+                cc.show(rotationBarCC, textRotationComboBox.getSelectedIndex() == 0 ? "show" : "hide");
+            }
+        });
+    }
+
+    private void initTextRotationCombox() {
         ArrayList<String> selectOption = new ArrayList<String>();
         selectOption.add(Inter.getLocText("FR-Designer_Custom-Angle"));
         VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class);
-		selectOption.addAll(Arrays.asList(processor.getComboxOption()));
+        selectOption.addAll(Arrays.asList(processor.getComboxOption()));
 
         textRotationComboBox = new UIComboBox(selectOption.toArray(new String[selectOption.size()]));
     }
 
-	private void initAllNames() {
-		hAlignmentPane.setGlobalName(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal"));
-		vAlignmentPane.setGlobalName(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical"));
-		imageLayoutComboBox.setGlobalName(Inter.getLocText("Image-Image_Layout"));
-		textComboBox.setGlobalName(Inter.getLocText("StyleAlignment-Text_Style"));
-		textRotationComboBox.setGlobalName(Inter.getLocText("StyleAlignment-Text_Rotation"));
-		rotationPane.setGlobalName(Inter.getLocText("StyleAlignment-Text_Rotation"));
-		leftIndentSpinner.setGlobalName(Inter.getLocText("Style-Left_Indent"));
-		rightIndentSpinner.setGlobalName(Inter.getLocText("Style-Right_Indent"));
-		spaceBeforeSpinner.setGlobalName(Inter.getLocText("Style-Spacing_Before"));
-		spaceAfterSpinner.setGlobalName(Inter.getLocText("Style-Spacing_After"));
-		lineSpaceSpinner.setGlobalName(Inter.getLocText("Style-Line_Spacing"));
-	}
-
-
-	private JPanel createPane() {
-		JPanel jp1 = new JPanel(new BorderLayout(0, 10));
-		JPanel jp2 = new JPanel(new BorderLayout(0, 10));
-		double p = TableLayout.PREFERRED;
-		double f = TableLayout.FILL;
-		double[] columnSize1 = {p, f};
-		double[] rowSize1 = {p, p, p, p, p, p, p, p, p, p, p, p, p, p};
-		Component[][] components1 = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Style")), null},
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal") + ":", UILabel.RIGHT), hPaneContainer},
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical") + ":", UILabel.RIGHT), vPaneContainer},
-				new Component[]{new JSeparator(JSeparator.HORIZONTAL), null},
-				new Component[]{new UILabel(Inter.getLocText("Image-Image_Layout")), null},
-				new Component[]{imageLayoutComboBox, null},
-				new Component[]{new JSeparator(JSeparator.HORIZONTAL), null},
-				new Component[]{new UILabel(Inter.getLocText("StyleAlignment-Text_Style")), null},
-				new Component[]{textComboBox, null},
-				new Component[]{new JSeparator(JSeparator.HORIZONTAL), null},
-				new Component[]{new UILabel(Inter.getLocText("StyleAlignment-Text_Rotation")), null},
-				new Component[]{textRotationComboBox, null},
-				new Component[]{rotationBarCC, null},
-				new Component[]{new JSeparator(JSeparator.HORIZONTAL), null},
-		};
-
-		double[] columnSize2 = {p, f};
-		double[] rowSize2 = {p, p, p, p};
-		Component[][] components2 = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Style_Indentation")), null},
-				new Component[]{new UILabel(Inter.getLocText("Style-Left_Indent") + ":", SwingConstants.RIGHT), creatSpinnerPane(leftIndentSpinner)},
-				new Component[]{new UILabel(Inter.getLocText("Style-Right_Indent") + ":", SwingConstants.RIGHT), creatSpinnerPane(rightIndentSpinner)},
-				new Component[]{new JSeparator(JSeparator.HORIZONTAL), null},
-		};
-
-		double[] columnSize3 = {p, f};
-		double[] rowSize3 = {p, p, p, p};
-		Component[][] components3 = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Style_Spacing")), null},
-				new Component[]{new UILabel(Inter.getLocText("Style-Spacing_Before") + ":", SwingConstants.RIGHT), creatSpinnerPane(spaceBeforeSpinner)},
-				new Component[]{new UILabel(Inter.getLocText("Style-Spacing_After") + ":", SwingConstants.RIGHT), creatSpinnerPane(spaceAfterSpinner)},
-				new Component[]{new UILabel(Inter.getLocText("Style-Line_Spacing") + ":", SwingConstants.RIGHT), creatSpinnerPane(lineSpaceSpinner)},
-		};
-		JPanel northPane = TableLayoutHelper.createTableLayoutPane(components1, rowSize1, columnSize1);
-		JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components2, rowSize2, columnSize2);
-		JPanel southPane = TableLayoutHelper.createTableLayoutPane(components3, rowSize3, columnSize3);
-
-		jp2.add(centerPane, BorderLayout.NORTH);
-		jp2.add(southPane, BorderLayout.CENTER);
-		jp1.add(northPane, BorderLayout.NORTH);
-		jp1.add(jp2, BorderLayout.CENTER);
-		return jp1;
-	}
-
-	private JPanel creatSpinnerPane(Component comp) {
-		JPanel jp = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-		jp.add(comp);
-		return jp;
-	}
-
-	/**
-	 * 标题
-	 * @return 标题
-	 */
-	public String title4PopupWindow() {
-		return Inter.getLocText("FR-Designer-StyleAlignment_Style_Alignment");
-	}
-
-	/**
-	 * Populate cellstyle border.
-	 *
-	 * @param style the new style.
-	 */
-	public void populateBean(Style style) {
-		hAlignmentPane.setSelectedItem(BaseUtils.getAlignment4Horizontal(style));
-		vAlignmentPane.setSelectedItem(style.getVerticalAlignment());
-
-		if (style.getTextStyle() == Style.TEXTSTYLE_SINGLELINE) {
-			this.textComboBox.setSelectedIndex(1);
-		} else if (style.getTextStyle() == Style.TEXTSTYLE_SINGLELINEADJUSTFONT) {
-			this.textComboBox.setSelectedIndex(2);
-		} else if (style.getTextStyle() == Style.TEXTSTYLE_MULTILINEADJUSTFONT) {
-			this.textComboBox.setSelectedIndex(3);
-		} else {
-			this.textComboBox.setSelectedIndex(0);
-		}
-		if (style.getVerticalText() == Style.VERTICALTEXT) {
-			textRotationComboBox.setSelectedIndex(style.getTextDirection() == Style.LEFT_TO_RIGHT ? 1 : 2);
-		} else {
-			textRotationComboBox.setSelectedIndex(0);
-			rotationPane.populateBean((double) style.getRotation());
-		}
-
-		if (style.getImageLayout() == Constants.IMAGE_TILED) {
-			imageLayoutComboBox.setSelectedIndex(1);
-		} else if (style.getImageLayout() == Constants.IMAGE_EXTEND) {
-			imageLayoutComboBox.setSelectedIndex(2);
-		} else if (style.getImageLayout() == Constants.IMAGE_ADJUST) {
-			imageLayoutComboBox.setSelectedIndex(3);
-		} else {
-			imageLayoutComboBox.setSelectedIndex(0);
-		}
-
-		int leftPadding = indentationUnitProcessor.paddingUnitProcessor(style.getPaddingLeft());
-		int rightPadding = indentationUnitProcessor.paddingUnitProcessor(style.getPaddingRight());
-
-		// alex:indent
-		this.leftIndentSpinner.setValue(new Integer(leftPadding));
-		this.rightIndentSpinner.setValue(new Integer(rightPadding));
-
-		this.spaceBeforeSpinner.setValue(style.getSpacingBefore());
-		this.spaceAfterSpinner.setValue(style.getSpacingAfter());
-		this.lineSpaceSpinner.setValue(style.getLineSpacing());
-
-	}
-
-	/**
-	 * Update cellstyle border
-	 *
-	 * @param style the new style.
-	 */
-	public Style update(Style style) {
-		// peter:需要判断传递进来的值是否为null.
-		if (style == null) {
-			return style;
-		}
-
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal"))) {
-			Integer h = this.hAlignmentPane.getSelectedItem();
-			style = style.deriveHorizontalAlignment(h == null ? -1 : h);
-		}
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical"))) {
-			Integer vAlign = this.vAlignmentPane.getSelectedItem();
-			if (vAlign != null) {
-				style = style.deriveVerticalAlignment(vAlign);
-			}
-		}
-
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("StyleAlignment-Text_Style"))) {
-			if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[0])) {
-				style = style.deriveTextStyle(Style.TEXTSTYLE_WRAPTEXT);
-			} else if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[1])) {
-				style = style.deriveTextStyle(Style.TEXTSTYLE_SINGLELINE);
-			} else if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[2])) {
-				style = style.deriveTextStyle(Style.TEXTSTYLE_SINGLELINEADJUSTFONT);
-			} else {
-				style = style.deriveTextStyle(Style.TEXTSTYLE_MULTILINEADJUSTFONT);
-			}
-		}
-
-		style = updateImageLayout(style);
-		style = updateTextRotation(style);
-		style = updateOther(style);
-		return style;
-	}
-
-
-	private Style updateImageLayout(Style style) {
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("Image-Image_Layout"))) {
-			if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[1])) {
-				style = style.deriveImageLayout(Constants.IMAGE_TILED);
-			} else if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[2])) {
-				style = style.deriveImageLayout(Constants.IMAGE_EXTEND);
-			} else if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[3])) {
-				style = style.deriveImageLayout(Constants.IMAGE_ADJUST);
-			} else {
-				style = style.deriveImageLayout(Constants.IMAGE_CENTER);
-			}
-		}
-		return style;
-	}
-
-
-	private Style updateTextRotation(Style style) {
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("StyleAlignment-Text_Rotation"))) {
-			if (this.textRotationComboBox.getSelectedIndex() != 0) {
-				style = style.deriveVerticalText(Style.VERTICALTEXT);
-				style = style.deriveRotation(0);
-				style = style.deriveTextDirection(this.textRotationComboBox.getSelectedIndex() == 1 ? Style.LEFT_TO_RIGHT : Style.RIGHT_TO_LEFT);
-			} else {
-				style = style.deriveVerticalText(Style.HORIZONTALTEXT);
-				style = style.deriveRotation(rotationPane.updateBean().intValue());
-			}
-		}
-		return style;
-	}
-
-	private Style updateOther(Style style) {
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("Style-Left_Indent"))) {
-			style = style.derivePaddingLeft(indentationUnitProcessor.paddingUnitGainFromSpinner((int)(this.leftIndentSpinner.getValue())));
-		}
-
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("Style-Right_Indent"))) {
-			style = style.derivePaddingRight(indentationUnitProcessor.paddingUnitGainFromSpinner((int)(this.rightIndentSpinner.getValue())));
-		}
-		//间距
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("Style-Spacing_Before"))) {
-			style = style.deriveSpacingBefore((int) (this.spaceBeforeSpinner.getValue()));
-		}
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("Style-Spacing_After"))) {
-			style = style.deriveSpacingAfter((int) (this.spaceAfterSpinner.getValue()));
-		}
-		if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("Style-Line_Spacing"))) {
-			style = style.deriveLineSpacing((int) (this.lineSpaceSpinner.getValue()));
-		}
-		return style;
-	}
-
-	/**
-	 * 注册监听事件
+    private void initAllNames() {
+        hAlignmentPane.setGlobalName(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal"));
+        vAlignmentPane.setGlobalName(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical"));
+        imageLayoutComboBox.setGlobalName(Inter.getLocText("FR-Designer_Image_Layout"));
+        textComboBox.setGlobalName(Inter.getLocText("FR-Designer_StyleAlignment_Text_Style"));
+        textRotationComboBox.setGlobalName(Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation"));
+        rotationPane.setGlobalName(Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation"));
+        leftIndentSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Left_Indent"));
+        rightIndentSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Right_Indent"));
+        spaceBeforeSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Spacing_Before"));
+        spaceAfterSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Spacing_After"));
+        lineSpaceSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Line_Spacing"));
+    }
+
+    private JPanel createPane() {
+        JPanel jp1 = new JPanel(new BorderLayout());
+        basicPane = new JPanel();
+        seniorPane = new JPanel();
+        basicPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"), 290, 20, basicPane());
+        seniorPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 290, 20, seniorPane());
+
+        jp1.add(basicPane, BorderLayout.NORTH);
+        jp1.add(seniorPane, BorderLayout.CENTER);
+
+        return jp1;
+    }
+
+    private JPanel basicPane() {
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal") + "   ", SwingConstants.LEFT), hPaneContainer},
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical") + "   ", SwingConstants.RIGHT), vPaneContainer},
+                new Component[]{null, null}
+        };
+        double[] rowSize = {p, p, p, p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+    }
+
+    private JPanel seniorPane() {
+        JPanel senPane = new JPanel(new BorderLayout());
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel((Inter.getLocText("FR-Designer_Image_Layout")) + "   ", SwingConstants.LEFT), imageLayoutComboBox},
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_StyleAlignment_Text_Style") + "   ", SwingConstants.LEFT), textComboBox},
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation") + "   ", SwingConstants.LEFT), textRotationComboBox},
+                new Component[]{null, rotationBarCC},
+                new Component[]{null, null},
+        };
+        double[] rowSize = {p, p, p, p, p, p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        JPanel tempPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM);
+        senPane.add(tempPane, BorderLayout.NORTH);
+        senPane.add(seniorDownPane(), BorderLayout.CENTER);
+        return senPane;
+
+    }
+
+    private JPanel seniorDownPane() {
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        leftIndentSpinner.setPreferredSize(SPINNER_DIMENSION);
+        rightIndentSpinner.setPreferredSize(SPINNER_DIMENSION);
+        spaceBeforeSpinner.setPreferredSize(SPINNER_DIMENSION);
+        spaceAfterSpinner.setPreferredSize(SPINNER_DIMENSION);
+        lineSpaceSpinner.setPreferredSize(SPINNER_DIMENSION);
+        Component[][] components = new Component[][]{
+                new Component[]{null, null, null},
+                new Component[]{new UILabel((Inter.getLocText("FR-Designer-StyleAlignment_Style_Indentation")) + "       ", SwingConstants.LEFT), creatSpinnerPane(leftIndentSpinner), creatSpinnerPane(rightIndentSpinner)},
+                new Component[]{null, new UILabel((Inter.getLocText("FR-Designer_Left")), SwingConstants.CENTER), new UILabel((Inter.getLocText("FR-Designer_Right")), SwingConstants.CENTER)},
+                new Component[]{new UILabel((Inter.getLocText("FR-Designer-StyleAlignment_Style_PartSpacing")) + "     ", SwingConstants.LEFT), creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)},
+                new Component[]{null, new UILabel((Inter.getLocText("FR-Designer_Front")), SwingConstants.CENTER), new UILabel((Inter.getLocText("FR-Designer_Behind")), SwingConstants.CENTER)},
+                new Component[]{new UILabel((Inter.getLocText("FR-Designer_Style_Line_Spacing")) + "     ", SwingConstants.LEFT), creatSpinnerPane(lineSpaceSpinner), null},
+        };
+        double[] rowSize = {p, p, p, p, p, p};
+        double[] columnSize = {p, f, f};
+        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+    }
+
+    private JPanel creatSpinnerPane(Component comp) {
+        JPanel jp = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
+        jp.add(comp);
+        return jp;
+    }
+
+    /**
+     * 标题
+     *
+     * @return 标题
+     */
+    public String title4PopupWindow() {
+        return Inter.getLocText("FR-Designer-StyleAlignment_Style_Alignment");
+    }
+
+    /**
+     * Populate cellstyle border.
      *
-	 * @param listener 观察者监听事件
-	 */
-	public void registerNameListener(GlobalNameListener listener) {
-		globalNameListener = listener;
-	}
-
-	/**
-	 * 是否响应监听
-	 *
-     *  @return 否
-	 */
-	public boolean shouldResponseNameListener() {
-		return false;
-	}
-
-	/**
-	 *
-	 * @param name
-	 */
-	public void setGlobalName(String name) {
-	}
+     * @param style the new style.
+     */
+    public void populateBean(Style style) {
+        hAlignmentPane.setSelectedItem(BaseUtils.getAlignment4Horizontal(style));
+        vAlignmentPane.setSelectedItem(style.getVerticalAlignment());
+
+        if (style.getTextStyle() == Style.TEXTSTYLE_SINGLELINE) {
+            this.textComboBox.setSelectedIndex(1);
+        } else if (style.getTextStyle() == Style.TEXTSTYLE_SINGLELINEADJUSTFONT) {
+            this.textComboBox.setSelectedIndex(2);
+        } else if (style.getTextStyle() == Style.TEXTSTYLE_MULTILINEADJUSTFONT) {
+            this.textComboBox.setSelectedIndex(3);
+        } else {
+            this.textComboBox.setSelectedIndex(0);
+        }
+        if (style.getVerticalText() == Style.VERTICALTEXT) {
+            textRotationComboBox.setSelectedIndex(style.getTextDirection() == Style.LEFT_TO_RIGHT ? 1 : 2);
+        } else {
+            textRotationComboBox.setSelectedIndex(0);
+            rotationPane.populateBean((double) style.getRotation());
+        }
+
+        if (style.getImageLayout() == Constants.IMAGE_TILED) {
+            imageLayoutComboBox.setSelectedIndex(1);
+        } else if (style.getImageLayout() == Constants.IMAGE_EXTEND) {
+            imageLayoutComboBox.setSelectedIndex(2);
+        } else if (style.getImageLayout() == Constants.IMAGE_ADJUST) {
+            imageLayoutComboBox.setSelectedIndex(3);
+        } else {
+            imageLayoutComboBox.setSelectedIndex(0);
+        }
+
+        int leftPadding = indentationUnitProcessor.paddingUnitProcessor(style.getPaddingLeft());
+        int rightPadding = indentationUnitProcessor.paddingUnitProcessor(style.getPaddingRight());
+
+        // alex:indent
+        this.leftIndentSpinner.setValue(new Integer(leftPadding));
+        this.rightIndentSpinner.setValue(new Integer(rightPadding));
+
+        this.spaceBeforeSpinner.setValue(style.getSpacingBefore());
+        this.spaceAfterSpinner.setValue(style.getSpacingAfter());
+        this.lineSpaceSpinner.setValue(style.getLineSpacing());
+
+    }
+
+    /**
+     * Update cellstyle border
+     *
+     * @param style the new style.
+     */
+    public Style update(Style style) {
+        // peter:需要判断传递进来的值是否为null.
+        if (style == null) {
+            return style;
+        }
+
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal"))) {
+            Integer h = this.hAlignmentPane.getSelectedItem();
+            style = style.deriveHorizontalAlignment(h == null ? -1 : h);
+        }
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical"))) {
+            Integer vAlign = this.vAlignmentPane.getSelectedItem();
+            if (vAlign != null) {
+                style = style.deriveVerticalAlignment(vAlign);
+            }
+        }
+
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_StyleAlignment_Text_Style"))) {
+            if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[0])) {
+                style = style.deriveTextStyle(Style.TEXTSTYLE_WRAPTEXT);
+            } else if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[1])) {
+                style = style.deriveTextStyle(Style.TEXTSTYLE_SINGLELINE);
+            } else if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[2])) {
+                style = style.deriveTextStyle(Style.TEXTSTYLE_SINGLELINEADJUSTFONT);
+            } else {
+                style = style.deriveTextStyle(Style.TEXTSTYLE_MULTILINEADJUSTFONT);
+            }
+        }
+
+        style = updateImageLayout(style);
+        style = updateTextRotation(style);
+        style = updateOther(style);
+        return style;
+    }
+
+
+    private Style updateImageLayout(Style style) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Image_Layout"))) {
+            if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[1])) {
+                style = style.deriveImageLayout(Constants.IMAGE_TILED);
+            } else if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[2])) {
+                style = style.deriveImageLayout(Constants.IMAGE_EXTEND);
+            } else if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[3])) {
+                style = style.deriveImageLayout(Constants.IMAGE_ADJUST);
+            } else {
+                style = style.deriveImageLayout(Constants.IMAGE_CENTER);
+            }
+        }
+        return style;
+    }
+
+
+    private Style updateTextRotation(Style style) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation"))) {
+            if (this.textRotationComboBox.getSelectedIndex() != 0) {
+                style = style.deriveVerticalText(Style.VERTICALTEXT);
+                style = style.deriveRotation(0);
+                style = style.deriveTextDirection(this.textRotationComboBox.getSelectedIndex() == 1 ? Style.LEFT_TO_RIGHT : Style.RIGHT_TO_LEFT);
+            } else {
+                style = style.deriveVerticalText(Style.HORIZONTALTEXT);
+                style = style.deriveRotation(rotationPane.updateBean().intValue());
+            }
+        }
+        return style;
+    }
+
+    private Style updateOther(Style style) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Left_Indent"))) {
+            style = style.derivePaddingLeft(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.leftIndentSpinner.getValue())));
+        }
+
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Right_Indent"))) {
+            style = style.derivePaddingRight(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.rightIndentSpinner.getValue())));
+        }
+        //间距
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Spacing_Before"))) {
+            style = style.deriveSpacingBefore((int) (this.spaceBeforeSpinner.getValue()));
+        }
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Spacing_After"))) {
+            style = style.deriveSpacingAfter((int) (this.spaceAfterSpinner.getValue()));
+        }
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Line_Spacing"))) {
+            style = style.deriveLineSpacing((int) (this.lineSpaceSpinner.getValue()));
+        }
+        return style;
+    }
+
+    /**
+     * 注册监听事件
+     *
+     * @param listener 观察者监听事件
+     */
+    public void registerNameListener(GlobalNameListener listener) {
+        globalNameListener = listener;
+    }
+
+    /**
+     * 是否响应监听
+     *
+     * @return 否
+     */
+    public boolean shouldResponseNameListener() {
+        return false;
+    }
+
+    /**
+     * @param name
+     */
+    public void setGlobalName(String name) {
+    }
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/gui/style/BorderPane.java b/designer_base/src/com/fr/design/gui/style/BorderPane.java
index 585bfe98b..3be8b0681 100644
--- a/designer_base/src/com/fr/design/gui/style/BorderPane.java
+++ b/designer_base/src/com/fr/design/gui/style/BorderPane.java
@@ -4,218 +4,214 @@ package com.fr.design.gui.style;
  * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
  */
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.GridLayout;
-
-import com.fr.design.constants.LayoutConstants;
-import com.fr.design.foldablepane.UIExpandablePane;
-import com.fr.design.gui.ilable.UILabel;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.Style;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.LineComboBox;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
-import com.fr.design.style.color.NewColorSelectBox;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 
 /**
  * @author zhou
  * @since 2012-5-28下午6:22:04
  */
 public class BorderPane extends AbstractBasicStylePane {
-	private boolean insideMode = false;
-
-	private UIToggleButton topToggleButton;
-	private UIToggleButton horizontalToggleButton;
-	private UIToggleButton bottomToggleButton;
-	private UIToggleButton leftToggleButton;
-	private UIToggleButton verticalToggleButton;
-	private UIToggleButton rightToggleButton;
-
-	private UIToggleButton innerToggleButton;
-	private UIToggleButton outerToggleButton;
-
-	private LineComboBox currentLineCombo;
-	private NewColorSelectBox currentLineColorPane;
-	private JPanel panel;
-	private JPanel borderPanel;
-	private JPanel backgroundPanel;
-	private BackgroundPane backgroundPane;
-
-	public BorderPane() {
-		this.initComponents();
-	}
-
-	public static void main(String[] args){
-		JFrame jf = new JFrame("test");
-		jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		JPanel content = (JPanel) jf.getContentPane();
-		content.setLayout(new BorderLayout());
-		content.add(new BorderPane(), BorderLayout.CENTER);
-		GUICoreUtils.centerWindow(jf);
-		jf.setSize(290, 400);
-		jf.setVisible(true);
-	}
-	protected void initComponents() {
-		initButtonsWithIcon();
-		this.setLayout(new BorderLayout(0, 6));
-		JPanel externalPane = new JPanel(new GridLayout(0, 4));
-		externalPane.add(topToggleButton);
-		externalPane.add(leftToggleButton);
-		externalPane.add(bottomToggleButton);
-		externalPane.add(rightToggleButton);
-		JPanel insidePane = new JPanel(new GridLayout(0, 2));
-		insidePane.add(horizontalToggleButton);
-		insidePane.add(verticalToggleButton);
-		double f = TableLayout.FILL;
-		double p = TableLayout.PREFERRED;
-		Component[][] components = new Component[][]{
-				new Component[]{null,null},
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style") + "    ", SwingConstants.LEFT), currentLineCombo},
-				new Component[]{null,null},
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + "    ", SwingConstants.LEFT), currentLineColorPane},
-				new Component[]{null,null},
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") +"    ", SwingConstants.LEFT),outerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/out.png"))},
-				new Component[]{null,externalPane},
-				new Component[]{null,null},
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") +"    ", SwingConstants.LEFT),innerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/in.png"))},
-				new Component[]{null,insidePane},
-				new Component[]{null,null}
-		};
-		double[] rowSize = {p, p, p, p, p, p, p, p, p, p, p};
-		double[] columnSize = {p,f};
-		int[][] rowCount = {{1, 1},{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
-		panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
-		borderPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Border"),280,20,panel);
-		this.add(borderPanel,BorderLayout.NORTH);
-
-		backgroundPane = new BackgroundPane();
-		backgroundPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Background"),280,20,backgroundPane);
-		this.add(backgroundPanel,BorderLayout.CENTER);
-
-		outerToggleButton.addChangeListener(outerToggleButtonChangeListener);
-		innerToggleButton.addChangeListener(innerToggleButtonChangeListener);
-	}
-
-	ChangeListener outerToggleButtonChangeListener = new ChangeListener() {
-		@Override
-		public void stateChanged(ChangeEvent e) {
-			boolean value = outerToggleButton.isSelected();
-			topToggleButton.setSelected(value);
-			bottomToggleButton.setSelected(value);
-			leftToggleButton.setSelected(value);
-			rightToggleButton.setSelected(value);
-		}
-	};
-
-	ChangeListener innerToggleButtonChangeListener = new ChangeListener() {
-		@Override
-		public void stateChanged(ChangeEvent e) {
-			boolean value = innerToggleButton.isSelected();
-			horizontalToggleButton.setSelected(value);
-			verticalToggleButton.setSelected(value);
-		}
-	};
-
-	private void initButtonsWithIcon(){
-		topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
-		leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
-		bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
-		rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
-		horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
-		verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
-		this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
-		this.currentLineColorPane = new NewColorSelectBox(100);
-	}
-
-	@Override
-	public String title4PopupWindow() {
-		return Inter.getLocText("FR-Designer_Border");
-	}
-
-	@Override
-	public void populateBean(Style style) {
-		if (style == null) {
-			style = Style.DEFAULT_STYLE;
-		}
-
-		CellBorderStyle cellBorderStyle = new CellBorderStyle();
-		cellBorderStyle.setTopStyle(style.getBorderTop());
-		cellBorderStyle.setTopColor(style.getBorderTopColor());
-		cellBorderStyle.setLeftStyle(style.getBorderLeft());
-		cellBorderStyle.setLeftColor(style.getBorderLeftColor());
-		cellBorderStyle.setBottomStyle(style.getBorderBottom());
-		cellBorderStyle.setBottomColor(style.getBorderBottomColor());
-		cellBorderStyle.setRightStyle(style.getBorderRight());
-		cellBorderStyle.setRightColor(style.getBorderRightColor());
-		this.backgroundPane.populateBean(style.getBackground());
-		this.populateBean(cellBorderStyle, false, style.getBorderTop(), style.getBorderTopColor());
-
-	}
-
-	public void populateBean(CellBorderStyle cellBorderStyle, boolean insideMode, int currentStyle, Color currentColor) {
-		this.insideMode = insideMode;
-
-		this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getTopStyle() == Constants.LINE_NONE ? Constants.LINE_THIN : cellBorderStyle.getTopStyle());
-		this.currentLineColorPane.setSelectObject(cellBorderStyle.getTopColor());
-
-		this.topToggleButton.setSelected(cellBorderStyle.getTopStyle() != Constants.LINE_NONE);
-		this.bottomToggleButton.setSelected(cellBorderStyle.getBottomStyle() != Constants.LINE_NONE);
-		this.leftToggleButton.setSelected(cellBorderStyle.getLeftStyle() != Constants.LINE_NONE);
-		this.rightToggleButton.setSelected(cellBorderStyle.getRightStyle() != Constants.LINE_NONE);
-
-		this.horizontalToggleButton.setSelected(cellBorderStyle.getHorizontalStyle() != Constants.LINE_NONE);
-		this.verticalToggleButton.setSelected(cellBorderStyle.getVerticalStyle() != Constants.LINE_NONE);
-
-		this.innerToggleButton.setSelected(cellBorderStyle.getInnerBorder() != Constants.LINE_NONE);
-		this.outerToggleButton.setSelected(cellBorderStyle.getOuterBorderStyle() != Constants.LINE_NONE);
+    private boolean insideMode = false;
+
+    private UIToggleButton topToggleButton;
+    private UIToggleButton horizontalToggleButton;
+    private UIToggleButton bottomToggleButton;
+    private UIToggleButton leftToggleButton;
+    private UIToggleButton verticalToggleButton;
+    private UIToggleButton rightToggleButton;
+
+    private UIToggleButton innerToggleButton;
+    private UIToggleButton outerToggleButton;
+
+    private LineComboBox currentLineCombo;
+    private NewColorSelectBox currentLineColorPane;
+    private JPanel panel;
+    private JPanel borderPanel;
+    private JPanel backgroundPanel;
+    private BackgroundPane backgroundPane;
+
+    public BorderPane() {
+        this.initComponents();
+    }
+
+    public static void main(String[] args) {
+        JFrame jf = new JFrame("test");
+        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        JPanel content = (JPanel) jf.getContentPane();
+        content.setLayout(new BorderLayout());
+        content.add(new BorderPane(), BorderLayout.CENTER);
+        GUICoreUtils.centerWindow(jf);
+        jf.setSize(290, 400);
+        jf.setVisible(true);
+    }
+
+    protected void initComponents() {
+        initButtonsWithIcon();
+        this.setLayout(new BorderLayout(0, 6));
+        JPanel externalPane = new JPanel(new GridLayout(0, 4));
+        externalPane.add(topToggleButton);
+        externalPane.add(leftToggleButton);
+        externalPane.add(bottomToggleButton);
+        externalPane.add(rightToggleButton);
+        JPanel insidePane = new JPanel(new GridLayout(0, 2));
+        insidePane.add(horizontalToggleButton);
+        insidePane.add(verticalToggleButton);
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style") + "    ", SwingConstants.LEFT), currentLineCombo},
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + "    ", SwingConstants.LEFT), currentLineColorPane},
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") + "    ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/out.png"))},
+                new Component[]{null, externalPane},
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") + "    ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/in.png"))},
+                new Component[]{null, insidePane},
+                new Component[]{null, null}
+        };
+        double[] rowSize = {p, p, p, p, p, p, p, p, p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
+        borderPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Border"), 280, 20, panel);
+        this.add(borderPanel, BorderLayout.NORTH);
+
+        backgroundPane = new BackgroundPane();
+        backgroundPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Background"), 280, 20, backgroundPane);
+        this.add(backgroundPanel, BorderLayout.CENTER);
+
+        outerToggleButton.addChangeListener(outerToggleButtonChangeListener);
+        innerToggleButton.addChangeListener(innerToggleButtonChangeListener);
+    }
+
+    ChangeListener outerToggleButtonChangeListener = new ChangeListener() {
+        @Override
+        public void stateChanged(ChangeEvent e) {
+            boolean value = outerToggleButton.isSelected();
+            topToggleButton.setSelected(value);
+            bottomToggleButton.setSelected(value);
+            leftToggleButton.setSelected(value);
+            rightToggleButton.setSelected(value);
+        }
+    };
+
+    ChangeListener innerToggleButtonChangeListener = new ChangeListener() {
+        @Override
+        public void stateChanged(ChangeEvent e) {
+            boolean value = innerToggleButton.isSelected();
+            horizontalToggleButton.setSelected(value);
+            verticalToggleButton.setSelected(value);
+        }
+    };
+
+    private void initButtonsWithIcon() {
+        topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
+        leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
+        bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
+        rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
+        horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
+        verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
+        this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
+        this.currentLineColorPane = new NewColorSelectBox(100);
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return Inter.getLocText("FR-Designer_Cell");
+    }
+
+    @Override
+    public void populateBean(Style style) {
+        if (style == null) {
+            style = Style.DEFAULT_STYLE;
+        }
+
+        CellBorderStyle cellBorderStyle = new CellBorderStyle();
+        cellBorderStyle.setTopStyle(style.getBorderTop());
+        cellBorderStyle.setTopColor(style.getBorderTopColor());
+        cellBorderStyle.setLeftStyle(style.getBorderLeft());
+        cellBorderStyle.setLeftColor(style.getBorderLeftColor());
+        cellBorderStyle.setBottomStyle(style.getBorderBottom());
+        cellBorderStyle.setBottomColor(style.getBorderBottomColor());
+        cellBorderStyle.setRightStyle(style.getBorderRight());
+        cellBorderStyle.setRightColor(style.getBorderRightColor());
+        this.backgroundPane.populateBean(style.getBackground());
+        this.populateBean(cellBorderStyle, false, style.getBorderTop(), style.getBorderTopColor());
+
+    }
+
+    public void populateBean(CellBorderStyle cellBorderStyle, boolean insideMode, int currentStyle, Color currentColor) {
+        this.insideMode = insideMode;
+
+        this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getTopStyle() == Constants.LINE_NONE ? Constants.LINE_THIN : cellBorderStyle.getTopStyle());
+        this.currentLineColorPane.setSelectObject(cellBorderStyle.getTopColor());
+
+        this.topToggleButton.setSelected(cellBorderStyle.getTopStyle() != Constants.LINE_NONE);
+        this.bottomToggleButton.setSelected(cellBorderStyle.getBottomStyle() != Constants.LINE_NONE);
+        this.leftToggleButton.setSelected(cellBorderStyle.getLeftStyle() != Constants.LINE_NONE);
+        this.rightToggleButton.setSelected(cellBorderStyle.getRightStyle() != Constants.LINE_NONE);
+
+        this.horizontalToggleButton.setSelected(cellBorderStyle.getHorizontalStyle() != Constants.LINE_NONE);
+        this.verticalToggleButton.setSelected(cellBorderStyle.getVerticalStyle() != Constants.LINE_NONE);
+
+        this.innerToggleButton.setSelected(cellBorderStyle.getInnerBorder() != Constants.LINE_NONE);
+        this.outerToggleButton.setSelected(cellBorderStyle.getOuterBorderStyle() != Constants.LINE_NONE);
 
         this.innerToggleButton.setEnabled(this.insideMode);
-		this.horizontalToggleButton.setEnabled(this.insideMode);
-		this.verticalToggleButton.setEnabled(this.insideMode);
-	}
-
-	public Style update(Style style) {
-		style = style.deriveBackground(backgroundPane.update());
-		if (style == null) {
-			style = Style.DEFAULT_STYLE;
-		}
-
-		CellBorderStyle cellBorderStyle = this.update();
-
-		style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
-				cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
-		return style;
-	}
-
-	public CellBorderStyle update() {
-		int lineStyle = currentLineCombo.getSelectedLineStyle();
-		Color lineColor = currentLineColorPane.getSelectObject();
-		CellBorderStyle cellBorderStyle = new CellBorderStyle();
-		cellBorderStyle.setTopColor(lineColor);
-		cellBorderStyle.setTopStyle(topToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-		cellBorderStyle.setBottomColor(lineColor);
-		cellBorderStyle.setBottomStyle(bottomToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-		cellBorderStyle.setLeftColor(lineColor);
-		cellBorderStyle.setLeftStyle(leftToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-		cellBorderStyle.setRightColor(lineColor);
-		cellBorderStyle.setRightStyle(rightToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-		cellBorderStyle.setVerticalColor(lineColor);
-		cellBorderStyle.setVerticalStyle(verticalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-		cellBorderStyle.setHorizontalColor(lineColor);
-		cellBorderStyle.setHorizontalStyle(horizontalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
-		return cellBorderStyle;
-	}
+        this.horizontalToggleButton.setEnabled(this.insideMode);
+        this.verticalToggleButton.setEnabled(this.insideMode);
+    }
+
+    public Style update(Style style) {
+        style = style.deriveBackground(backgroundPane.update());
+        if (style == null) {
+            style = Style.DEFAULT_STYLE;
+        }
+
+        CellBorderStyle cellBorderStyle = this.update();
+
+        style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
+                cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
+        return style;
+    }
+
+    public CellBorderStyle update() {
+        int lineStyle = currentLineCombo.getSelectedLineStyle();
+        Color lineColor = currentLineColorPane.getSelectObject();
+        CellBorderStyle cellBorderStyle = new CellBorderStyle();
+        cellBorderStyle.setTopColor(lineColor);
+        cellBorderStyle.setTopStyle(topToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setBottomColor(lineColor);
+        cellBorderStyle.setBottomStyle(bottomToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setLeftColor(lineColor);
+        cellBorderStyle.setLeftStyle(leftToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setRightColor(lineColor);
+        cellBorderStyle.setRightStyle(rightToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setVerticalColor(lineColor);
+        cellBorderStyle.setVerticalStyle(verticalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        cellBorderStyle.setHorizontalColor(lineColor);
+        cellBorderStyle.setHorizontalStyle(horizontalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
+        return cellBorderStyle;
+    }
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/gui/style/FRFontPane.java b/designer_base/src/com/fr/design/gui/style/FRFontPane.java
index e7267d683..d548177f5 100644
--- a/designer_base/src/com/fr/design/gui/style/FRFontPane.java
+++ b/designer_base/src/com/fr/design/gui/style/FRFontPane.java
@@ -4,35 +4,34 @@ package com.fr.design.gui.style;
  * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
  */
 
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.Vector;
-
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.Style;
 import com.fr.base.Utils;
-import com.fr.design.constants.UIConstants;
 import com.fr.design.constants.LayoutConstants;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.event.GlobalNameListener;
 import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
-import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.LineComboBox;
+import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.DefaultValues;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
-import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Vector;
 
 /**
  * Pane to edit Font.
@@ -68,7 +67,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
         this.initComponents();
     }
 
-    public static void main(String[] args){
+    public static void main(String[] args) {
         JFrame jf = new JFrame("test");
         jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         JPanel content = (JPanel) jf.getContentPane();
@@ -209,7 +208,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
         return style.deriveFRFont(frFont);
     }
 
-    public static Vector<Integer> getFontSizes(){
+    public static Vector<Integer> getFontSizes() {
         Vector<Integer> FONT_SIZES = new Vector<Integer>();
         for (int i = 1; i < MAX_FONT_SIZE; i++) {
             FONT_SIZES.add(i);
@@ -240,20 +239,16 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
         subPane = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/sub.png"));
         subPane.setPreferredSize(BUTTON_SIZE);
         isSuperOrSubPane = new TwoButtonPane(superPane, subPane);
-//        Component[] components_font = new Component[]{
-//                colorSelectPane, italic, bold, underline, isStrikethroughCheckBox, isShadowCheckBox
-//        };
         Component[] components_font = new Component[]{
                 colorSelectPane, underline, isStrikethroughCheckBox, isShadowCheckBox
         };
         buttonPane = new JPanel(new BorderLayout());
         buttonPane.add(GUICoreUtils.createFlowPane(components_font, FlowLayout.LEFT, LayoutConstants.HGAP_SMALL));
-//        buttonPane.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
         linePane = new JPanel(new CardLayout());
         initAllNames();
         setToolTips();
         this.setLayout(new BorderLayout());
-        this.add(fontNameComboBox, BorderLayout.NORTH);
+//        this.add(fontNameComboBox, BorderLayout.NORTH);
         this.add(createPane(), BorderLayout.CENTER);
         DefaultValues defaultValues = FRContext.getDefaultValues();
         populateBean(defaultValues.getFRFont());
@@ -328,15 +323,11 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     }
 
     private JPanel createPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double[] columnSize = {f, f};
-        double[] rowSize = {p,p};
-        Component[][] components = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{createLeftPane(), createRightPane()},
-        };
-        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        JPanel createPane = new JPanel(new BorderLayout(3, 5));
+        createPane.add(fontNameComboBox, BorderLayout.NORTH);
+        createPane.add(createLeftPane(), BorderLayout.CENTER);
+        createPane.add(createRightPane(), BorderLayout.EAST);
+        return createPane;
     }
 
     /**
diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java
index 4d81d0101..3f71c1eb7 100644
--- a/designer_base/src/com/fr/design/gui/style/FormatPane.java
+++ b/designer_base/src/com/fr/design/gui/style/FormatPane.java
@@ -15,7 +15,6 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
@@ -24,7 +23,8 @@ import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.text.Format;
 import java.text.SimpleDateFormat;
 
@@ -34,7 +34,7 @@ import java.text.SimpleDateFormat;
  * @author zhou
  * @since 2012-5-24上午10:57:00
  */
-public class FormatPane extends AbstractBasicStylePane{
+public class FormatPane extends AbstractBasicStylePane {
     private static final long serialVersionUID = 724330854437726751L;
 
     private static final int LABLE_X = 4;
@@ -61,6 +61,7 @@ public class FormatPane extends AbstractBasicStylePane{
     private boolean isRightFormate;
     private boolean isDate = false;
     private boolean isFormat = false;
+
     /**
      * Constructor.
      */
@@ -68,17 +69,6 @@ public class FormatPane extends AbstractBasicStylePane{
         this.initComponents(TYPES);
     }
 
-    public static void main(String[] args){
-        JFrame jf = new JFrame("test");
-        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        JPanel content = (JPanel) jf.getContentPane();
-        content.setLayout(new BorderLayout());
-        content.add(new FormatPane(), BorderLayout.CENTER);
-        GUICoreUtils.centerWindow(jf);
-        jf.setSize(290, 400);
-        jf.setVisible(true);
-    }
-
     protected void initComponents(Integer[] types) {
         this.setLayout(new BorderLayout(0, 4));
         iniSampleLable();
@@ -95,7 +85,7 @@ public class FormatPane extends AbstractBasicStylePane{
         contentPane.add(sampleLabel, BorderLayout.NORTH);
         centerPane = new JPanel(new CardLayout());
         centerPane.add(new JPanel(), "hide");
-        centerPane.setPreferredSize(new Dimension(0, 0) );
+        centerPane.setPreferredSize(new Dimension(0, 0));
         centerPane.add(contentPane, "show");
         formatFontPane = new JPanel(new BorderLayout());
         formatFontPane.add(centerPane, BorderLayout.NORTH);
@@ -110,20 +100,20 @@ public class FormatPane extends AbstractBasicStylePane{
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{null,null},
-                new Component[]{new UILabel(Inter.getLocText("FR-Base_Format")+"   ", SwingConstants.LEFT), typeComboBox },
-                new Component[]{null,centerPane},
+                new Component[]{null, null},
+                new Component[]{new UILabel(Inter.getLocText("FR-Base_Format") + "   ", SwingConstants.LEFT), typeComboBox},
+                new Component[]{null, centerPane},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_FRFont"), SwingConstants.LEFT), frFontPane},
-                new Component[]{null,null}
+                new Component[]{null, null}
         };
         double[] rowSize = {p, p, p, p, p};
-        double[] columnSize = {p,f};
-        int[][] rowCount = {{1, 1},{1, 1}, {1, 1}, {1, 3}, {1, 1}};
-        JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
-        this.add(panel,BorderLayout.CENTER);
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 3}, {1, 1}};
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
+        this.add(panel, BorderLayout.CENTER);
     }
 
-    protected UIComboBoxRenderer createComBoxRender(){
+    protected UIComboBoxRenderer createComBoxRender() {
         return new UIComboBoxRenderer() {
             @Override
             public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
@@ -174,10 +164,11 @@ public class FormatPane extends AbstractBasicStylePane{
 
     /**
      * 弹出框标题
+     *
      * @return 标题
      */
     public String title4PopupWindow() {
-        return Inter.getLocText("FR-Base_Format");
+        return Inter.getLocText("FR-Designer_Text");
     }
 
     /**
@@ -223,8 +214,8 @@ public class FormatPane extends AbstractBasicStylePane{
      * 判断是否是数组有模式
      *
      * @param stringArray 字符串数组
-     * @param pattern   格式
-     * @return  是否是数组有模式
+     * @param pattern     格式
+     * @return 是否是数组有模式
      */
     public static int isArrayContainPattern(String[] stringArray, String pattern) {
         for (int i = 0; i < stringArray.length; i++) {
@@ -301,20 +292,20 @@ public class FormatPane extends AbstractBasicStylePane{
 
         @Override
         public void itemStateChanged(ItemEvent e) {
-            if(e.getStateChange() == ItemEvent.SELECTED){
+            if (e.getStateChange() == ItemEvent.SELECTED) {
                 int contents = getFormatContents();
                 String[] items = FormatField.getInstance().getFormatArray(contents);
                 CardLayout cardLayout = (CardLayout) centerPane.getLayout();
 
                 if (isTextOrNull()) {
-                    centerPane.setPreferredSize(new Dimension(0, 0) );
+                    centerPane.setPreferredSize(new Dimension(0, 0));
                     cardLayout.show(centerPane, "hide");
                 } else {
                     textField.removeAllItems();
                     for (int i = 0; i < items.length; i++) {
                         textField.addItem(items[i]);
                     }
-                    centerPane.setPreferredSize(new Dimension(270, 70) );
+                    centerPane.setPreferredSize(new Dimension(270, 70));
                     cardLayout.show(centerPane, "show");
                 }
                 isFormat = true;
@@ -326,7 +317,7 @@ public class FormatPane extends AbstractBasicStylePane{
     ItemListener textFieldItemListener = new ItemListener() {
         @Override
         public void itemStateChanged(ItemEvent e) {
-            if(e.getStateChange() == ItemEvent.SELECTED){
+            if (e.getStateChange() == ItemEvent.SELECTED) {
                 isFormat = true;
                 refreshPreviewLabel();
             }
@@ -348,7 +339,7 @@ public class FormatPane extends AbstractBasicStylePane{
      * update
      */
     public Style update(Style style) {
-        if (isFormat){
+        if (isFormat) {
             isFormat = false;
             return style.deriveFormat(this.update());
         } else {
diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties
index 11d84d53c..b958853f3 100644
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@@ -2033,3 +2033,20 @@ FR-Designer_Expand=Expand
 FR-Designer_ExpendSort=ExpendSort
 FR-Designer_ExpandD_Expandable=Expandable
 FR-Designer_Read_failure=Read_failure
+FR-Designer-StyleAlignment_Style_PartSpacing=PartSpacing
+FR-Designer_Image_Layout=Image_Layout
+FR-Designer_StyleAlignment_Text_Style=Text_Style
+FR-Designer_StyleAlignment_Text_Rotation=Text_Rotation
+FR-Designer_Style_Left_Indent=Left_Indent
+FR-Designer_Style_Right_Indent=Right_Indent
+FR-Designer_Style_Spacing_Before=Spacing_Before
+FR-Designer_Style_Spacing_After=Spacing_After
+FR-Designer_Style_Line_Spacing=Line_Spacing
+FR-Designer_Left=Left
+FR-Designer_Right=Right
+FR-Designer_Front=Front
+FR-Designer_Behind=Behind
+FR-Designer_StyleAlignment_Wrap_Text=Wrap_Text
+FR-Designer_StyleAlignment_Single_Line=Single_Line
+FR-Designer_StyleAlignment_Single_Line(Adjust_Font)=Single_Line(Adjust_Font)
+FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)=Multi_Line(Adjust_Font)
diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties
index a8342d3b4..d88c8cbe2 100644
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@@ -2033,3 +2033,20 @@ FR-Designer_Expand=Expand
 FR-Designer_ExpendSort=ExpendSort
 FR-Designer_ExpandD_Expandable=Expandable
 FR-Designer_Read_failure=Read_failure
+FR-Designer-StyleAlignment_Style_PartSpacing=PartSpacing
+FR-Designer_Image_Layout=Image_Layout
+FR-Designer_StyleAlignment_Text_Style=Text_Style
+FR-Designer_StyleAlignment_Text_Rotation=Text_Rotation
+FR-Designer_Style_Left_Indent=Left_Indent
+FR-Designer_Style_Right_Indent=Right_Indent
+FR-Designer_Style_Spacing_Before=Spacing_Before
+FR-Designer_Style_Spacing_After=Spacing_After
+FR-Designer_Style_Line_Spacing=Line_Spacing
+FR-Designer_Left=Left
+FR-Designer_Right=Right
+FR-Designer_Front=Front
+FR-Designer_Behind=Behind
+FR-Designer_StyleAlignment_Wrap_Text=Wrap_Text
+FR-Designer_StyleAlignment_Single_Line=Single_Line
+FR-Designer_StyleAlignment_Single_Line(Adjust_Font)=Single_Line(Adjust_Font)
+FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)=Multi_Line(Adjust_Font)
diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
index 4caf82100..7c85af3bd 100644
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@@ -1989,24 +1989,40 @@ FR-Designer_Widget_Library=
 FR-Designer_No_Settings_Available=
 FR-Designer_Configured_Roles=\u69CB\u6210\u3055\u308C\u305F\u5F79\u5272
 FR-Designer_Scale_EnlargeOrReduce=
-FR-Designer_Scale_selfAdaptButton=\ 
-FR-Designer_Scale_customButton=\ 
-FR-Designer_FRFont_Subscript=\ 
-FR-Designer_FRFont_Superscript=\ 
-FR-Designer_FRFont_Shadow=\ 
-FR-Designer_FRFont_Strikethrough=\ 
-FR-Designer_FRFont_Underline=\ 
-FR-Designer_FRFont_bold=\ 
-FR-Designer_FRFont_italic=\ 
-FR-Designer_FRFont_Foreground=\ 
-FR-Designer_FRFont_Style=\ 
-FR-Designer_FRFont_plain=\ 
-FR-Designer_FRFont_bolditalic=\ 
-FR-Designer_outBorder=\ 
-FR-Designer_inBorder=\ 
-FR-Designer_ExpandD_Up_Father_Cell=\ 
-FR-Designer_ExpandD_Expand_Direction=\ 
-FR-Designer_Expand=\ 
-FR-Designer_ExpendSort=\ 
-FR-Designer_ExpandD_Expandable=\ 
-FR-Designer_Read_failure=\ 
\ No newline at end of file
+FR-Designer_Scale_selfAdaptButton=
+FR-Designer_Scale_customButton=
+FR-Designer_FRFont_Subscript=
+FR-Designer_FRFont_Superscript=
+FR-Designer_FRFont_Shadow=
+FR-Designer_FRFont_Strikethrough=
+FR-Designer_FRFont_Underline=
+FR-Designer_FRFont_bold=
+FR-Designer_FRFont_italic=
+FR-Designer_FRFont_Foreground=
+FR-Designer_FRFont_Style=
+FR-Designer_FRFont_plain=
+FR-Designer_FRFont_bolditalic=
+FR-Designer_outBorder=
+FR-Designer_inBorder=
+FR-Designer_ExpandD_Up_Father_Cell=
+FR-Designer_ExpandD_Expand_Direction=
+FR-Designer_Expand=
+FR-Designer_ExpendSort=
+FR-Designer_ExpandD_Expandable=
+FR-Designer_Read_failure=
+FR-Designer_Image_Layout=
+FR-Designer_StyleAlignment_Text_Style=
+FR-Designer_StyleAlignment_Text_Rotation=
+FR-Designer_Style_Left_Indent=
+FR-Designer_Style_Right_Indent=
+FR-Designer_Style_Spacing_Before=
+FR-Designer_Style_Spacing_After=
+FR-Designer_Style_Line_Spacing=
+FR-Designer_Left=
+FR-Designer_Right=
+FR-Designer_Front=
+FR-Designer_Behind=
+FR-Designer_StyleAlignment_Wrap_Text=
+FR-Designer_StyleAlignment_Single_Line=
+FR-Designer_StyleAlignment_Single_Line(Adjust_Font)=
+FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)=
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
index 6cd6849c7..dac296a5e 100644
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@@ -1989,23 +1989,39 @@ FR-Designer_Widget_Library=
 FR-Designer_No_Settings_Available=
 FR-Designer_Configured_Roles=\uC5ED\uD560\uC774\uAD6C\uC131\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 FR-Designer_Scale_EnlargeOrReduce=
-FR-Designer_Scale_selfAdaptButton=\ 
-FR-Designer_FRFont_Subscript=\ 
-FR-Designer_FRFont_Superscript=\ 
-FR-Designer_FRFont_Shadow=\ 
-FR-Designer_FRFont_Strikethrough=\ 
-FR-Designer_FRFont_Underline=\ 
-FR-Designer_FRFont_bold=\ 
-FR-Designer_FRFont_italic=\ 
-FR-Designer_FRFont_Foreground=\ 
-FR-Designer_FRFont_Style=\ 
-FR-Designer_FRFont_plain=\ 
-FR-Designer_FRFont_bolditalic=\ 
-FR-Designer_outBorder=\ 
-FR-Designer_inBorder=\ 
-FR-Designer_ExpandD_Up_Father_Cell=\ 
-FR-Designer_ExpandD_Expand_Direction=\ 
-FR-Designer_Expand=\ 
-FR-Designer_ExpendSort=\ 
-FR-Designer_ExpandD_Expandable=\ 
-FR-Designer_Read_failure=\ 
\ No newline at end of file
+FR-Designer_Scale_selfAdaptButton=
+FR-Designer_FRFont_Subscript=
+FR-Designer_FRFont_Superscript=
+FR-Designer_FRFont_Shadow=
+FR-Designer_FRFont_Strikethrough=
+FR-Designer_FRFont_Underline=
+FR-Designer_FRFont_bold=
+FR-Designer_FRFont_italic=
+FR-Designer_FRFont_Foreground=
+FR-Designer_FRFont_Style=
+FR-Designer_FRFont_plain=
+FR-Designer_FRFont_bolditalic=
+FR-Designer_outBorder=
+FR-Designer_inBorder=
+FR-Designer_ExpandD_Up_Father_Cell=
+FR-Designer_ExpandD_Expand_Direction=
+FR-Designer_Expand=
+FR-Designer_ExpendSort=
+FR-Designer_ExpandD_Expandable=
+FR-Designer_Read_failure=
+FR-Designer_Image_Layout=
+FR-Designer_StyleAlignment_Text_Style=
+FR-Designer_StyleAlignment_Text_Rotation=
+FR-Designer_Style_Left_Indent=
+FR-Designer_Style_Right_Indent=
+FR-Designer_Style_Spacing_Before=
+FR-Designer_Style_Spacing_After=
+FR-Designer_Style_Line_Spacing=
+FR-Designer_Left=
+FR-Designer_Right=
+FR-Designer_Front=
+FR-Designer_Behind=
+FR-Designer_StyleAlignment_Wrap_Text=
+FR-Designer_StyleAlignment_Single_Line=
+FR-Designer_StyleAlignment_Single_Line(Adjust_Font)=
+FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)=
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
index f0696de3d..7da10e611 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@@ -2031,3 +2031,20 @@ FR-Designer_Expand=\u6269\u5C55
 FR-Designer_ExpendSort=\u6269\u5C55\u540E\u6392\u5E8F
 FR-Designer_ExpandD_Expandable=\u53EF\u4F38\u5C55\u6027
 FR-Designer_Read_failure=\u8BFB\u53D6\u5931\u8D25\uFF0C\u53EF\u80FD\u6E90\u6587\u4EF6\u5DF2\u635F\u574F
+FR-Designer-StyleAlignment_Style_PartSpacing=\u6BB5\u95F4\u8DDD
+FR-Designer_Image_Layout=\u56FE\u7247\u5E03\u5C40
+FR-Designer_StyleAlignment_Text_Style=\u6587\u672C\u63A7\u5236
+FR-Designer_StyleAlignment_Text_Rotation=\u6587\u672C\u65B9\u5411
+FR-Designer_Style_Left_Indent=\u5DE6\u7F29\u8FDB
+FR-Designer_Style_Right_Indent=\u53F3\u7F29\u8FDB
+FR-Designer_Style_Spacing_Before=\u6BB5\u524D
+FR-Designer_Style_Spacing_After=\u6BB5\u540E
+FR-Designer_Style_Line_Spacing=\u884C\u95F4\u8DDD
+FR-Designer_Left=\u5DE6
+FR-Designer_Right=\u53F3
+FR-Designer_Front=\u524D
+FR-Designer_Behind=\u540E
+FR-Designer_StyleAlignment_Wrap_Text=\u81EA\u52A8\u6362\u884C
+FR-Designer_StyleAlignment_Single_Line=\u5355\u884C\u663E\u793A
+FR-Designer_StyleAlignment_Single_Line(Adjust_Font)=\u5355\u884C\u663E\u793A(\u8C03\u6574\u5B57\u4F53)
+FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)=\u591A\u884C\u663E\u793A(\u8C03\u6574\u5B57\u4F53)
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
index e1461903a..ba5a858dc 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@@ -2010,24 +2010,40 @@ FR-Designer_Float_Element=\u61F8\u6D6E\u5143\u7D20
 FR-Designer_Widget_Library=\u7D44\u4EF6\u5EAB
 FR-Designer_No_Settings_Available=\u7121\u53EF\u7528\u914D\u5BD8\u9805\uFF01
 FR-Designer_Configured_Roles=\u5DF2\u914D\u7F6E\u89D2\u8272
-FR-Designer_Scale_selfAdaptButton=\ 
-FR-Designer_Scale_customButton=\ 
-FR-Designer_FRFont_Subscript=\ 
-FR-Designer_FRFont_Superscript=\ 
-FR-Designer_FRFont_Shadow=\ 
-FR-Designer_FRFont_Strikethrough=\ 
-FR-Designer_FRFont_Underline=\ 
-FR-Designer_FRFont_bold=\ 
-FR-Designer_FRFont_italic=\ 
-FR-Designer_FRFont_Foreground=\ 
-FR-Designer_FRFont_Style=\ 
-FR-Designer_FRFont_plain=\ 
-FR-Designer_FRFont_bolditalic=\ 
-FR-Designer_outBorder=\  
-FR-Designer_inBorder=\ 
-FR-Designer_ExpandD_Up_Father_Cell=\ 
-FR-Designer_ExpandD_Expand_Direction=\ 
-FR-Designer_Expand=\ 
-FR-Designer_ExpendSort=\ 
-FR-Designer_ExpandD_Expandable=\ 
-FR-Designer_Read_failure=\ 
+FR-Designer_Scale_selfAdaptButton=
+FR-Designer_Scale_customButton=
+FR-Designer_FRFont_Subscript=
+FR-Designer_FRFont_Superscript=
+FR-Designer_FRFont_Shadow=
+FR-Designer_FRFont_Strikethrough=
+FR-Designer_FRFont_Underline=
+FR-Designer_FRFont_bold=
+FR-Designer_FRFont_italic=
+FR-Designer_FRFont_Foreground=
+FR-Designer_FRFont_Style=
+FR-Designer_FRFont_plain=
+FR-Designer_FRFont_bolditalic=
+FR-Designer_outBorder=
+FR-Designer_inBorder=
+FR-Designer_ExpandD_Up_Father_Cell=
+FR-Designer_ExpandD_Expand_Direction=
+FR-Designer_Expand=
+FR-Designer_ExpendSort=
+FR-Designer_ExpandD_Expandable=
+FR-Designer_Read_failure=
+FR-Designer_Image_Layout=
+FR-Designer_StyleAlignment_Text_Style=
+FR-Designer_StyleAlignment_Text_Rotation=
+FR-Designer_Style_Left_Indent=
+FR-Designer_Style_Right_Indent=
+FR-Designer_Style_Spacing_Before=
+FR-Designer_Style_Spacing_After=
+FR-Designer_Style_Line_Spacing=
+FR-Designer_Left=
+FR-Designer_Right=
+FR-Designer_Front=
+FR-Designer_Behind=
+FR-Designer_StyleAlignment_Wrap_Text=
+FR-Designer_StyleAlignment_Single_Line=
+FR-Designer_StyleAlignment_Single_Line(Adjust_Font)=
+FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)=