Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev

designer/src/com/fr/design/cell/editor/RichTextToolBar.java

@@ -134,7 +134,7 @@ public class RichTextToolBar extends BasicPane{
     }
     
     private void bindListener(){
-        FRFont defaultFont = RichTextPane.DEFAUL_FONT;
+        FRFont defaultFont = (this.textPane != null) ? FRFont.getInstance(this.textPane.getFont()) : RichTextPane.DEFAUL_FONT;
         fontNameComboBox.addItemListener(fontNameItemListener);
         fontNameComboBox.setSelectedItem(defaultFont.getFontName());
         fontSizeComboBox.addItemListener(fontSizeItemListener);

designer_base/src/com/fr/design/locale/designer.properties

@@ -1986,4 +1986,8 @@ FR-Designer_Edit_String_To_Formula=
 FR-Base_UnSignIn=
 Every=
 CellWrite-Preview_Cell_Content=Preview Content of Cell
-FormulaD-Data_Fields=Data Fields
+FormulaD-Data_Fields=Data Fields
+FR-Designer_Role=Role
+FR-Designer_Permissions=Permissions
+FR-Designer_Form_Button=Button
+FR-Designer_WF_Name=Name

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -1987,4 +1987,8 @@ FR-Designer_Edit_String_To_Formula=Edit String To Formula
 FR-Base_UnSignIn=\  Not Logged In
 Every=Every
 CellWrite-Preview_Cell_Content=Content of Cell
-FormulaD-Data_Fields=Data Items
+FormulaD-Data_Fields=Data Items
+FR-Designer_Role=Role
+FR-Designer_Permissions=Permissions
+FR-Designer_Form_Button=Button
+FR-Designer_WF_Name=Name

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -1982,4 +1982,8 @@ FR-Designer_Edit_String_To_Formula=\u662F\u5426\u5C06\u5B57\u7B26\u4E32\u7F16\u8
 FR-Base_UnSignIn=\  \u672A\u767B\u5F55
 Every=\u6BCF
 CellWrite-Preview_Cell_Content=\u9884\u89C8\u5355\u5143\u683C\u5185\u5BB9
-FormulaD-Data_Fields=\u6570\u636E\u9879
+FormulaD-Data_Fields=\u6570\u636E\u9879
+FR-Designer_Role=\u89D2\u8272
+FR-Designer_Permissions=\u6743\u9650
+FR-Designer_Form_Button=\u6309\u94AE
+FR-Designer_WF_Name=\u540D\u79F0

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -1982,4 +1982,8 @@ FR-Designer_Edit_String_To_Formula=\u662F\u5426\u5C07\u5B57\u5143\u4E32\u7DE8\u8
 FR-Base_UnSignIn=\u672A\u767B\u9304
 Every=\u6BCF
 CellWrite-Preview_Cell_Content=\u9810\u89BD\u5132\u5B58\u683C\u5167\u5BB9
-FormulaD-Data_Fields=\u8CC7\u6599\u9805
+FormulaD-Data_Fields=\u8CC7\u6599\u9805
+FR-Designer_Role=\u89D2\u8272
+FR-Designer_Permissions=\u6B0A\u9650
+FR-Designer_Form_Button=\u6309\u9215
+FR-Designer_WF_Name=\u540D\u7A31

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

@@ -10,11 +10,9 @@ import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.fun.impl.AbstractFormElementCaseEditorProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.widget.editors.BooleanEditor;
+import com.fr.design.mainframe.widget.editors.ElementCaseToolBarEditor;
 import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
-import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
-import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.FormProvider;
@@ -104,7 +102,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 				new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
 						.setI18NName(Inter.getLocText("FR-Layout_Padding"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-				new CRPropertyDescriptor("showToolBar", this.data.getClass()).setEditorClass(BooleanEditor.class)
+				new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
 						.setI18NName(Inter.getLocText("Form-EC_toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};