Merge pull request #652 in BA/design from ~LEE/design_release:release to release

* commit '3e336de89112134b56027d55542717a26f04e6a2':
  1
  国际化文件

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

@@ -515,4 +515,7 @@ FR-Designer_FormulaPane_Tips=Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_Fir
 FR-Designer_FormulaPane_Variables=Variables
 FR-Designer_FormulaPane_Formula_Description=Formula_Description
 FR-Designer_FormulaPane_Function_Detail=Function Detail
-FR-Designer_FormulaPane_Search=Search
+FR-Designer_FormulaPane_Search=Search
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=

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

@@ -516,3 +516,6 @@ FR-Designer_FormulaPane_Variables=Variables
 FR-Designer_FormulaPane_Formula_Description=Formula Description
 FR-Designer_FormulaPane_Function_Detail=Function Detail
 FR-Designer_FormulaPane_Search=Search
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=

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

@@ -494,4 +494,7 @@ FR-Designer_FormulaPane_Tips=\u30D2\u30F3\u30C8\:B1\u3092\u5165\u529B
 FR-Designer_FormulaPane_Variables=\u5909\u6570
 FR-Designer_FormulaPane_Formula_Description=\u516C\u5F0F\u8AAC\u660E
 FR-Designer_FormulaPane_Function_Detail=\u95A2\u6570\u660E\u7D30
-FR-Designer_FormulaPane_Search=\u691C\u7D22
+FR-Designer_FormulaPane_Search=\u691C\u7D22
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=

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

@@ -489,4 +489,7 @@ FR-Designer_FormulaPane_Tips=\uC54C\uB9BC\: B1\uC744\uC785\uB825\uD558\uC5EC\uCC
 FR-Designer_FormulaPane_Variables=\uBCC0\uC218
 FR-Designer_FormulaPane_Formula_Description=\uC218\uC2DD\uC124\uBA85
 FR-Designer_FormulaPane_Function_Detail=\uD568\uC218\uC0C1\uC138\uC0AC\uD56D
-FR-Designer_FormulaPane_Search=\uAC80\uC0C9
+FR-Designer_FormulaPane_Search=\uAC80\uC0C9
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=

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

@@ -519,4 +519,7 @@ FR-Designer_FormulaPane_Tips=\u63D0\u793A\:\u60A8\u53EF\u4EE5\u901A\u8FC7\u8F93\
 FR-Designer_FormulaPane_Variables=\u53D8\u91CF
 FR-Designer_FormulaPane_Formula_Description=\u516C\u5F0F\u8BF4\u660E
 FR-Designer_FormulaPane_Function_Detail=\u51FD\u6570\u660E\u7EC6
-FR-Designer_FormulaPane_Search=\u641C\u7D22
+FR-Designer_FormulaPane_Search=\u641C\u7D22
+FR-Designer_Tab_carousel=tab\u8F6E\u64AD
+FR-Designer_setCarousel=\u5F00\u542F\u8F6E\u64AD
+FR-Designer_carouselInterval=\u8F6E\u64AD\u95F4\u9694

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

@@ -507,4 +507,7 @@ FR-Designer_FormulaPane_Tips=\u63D0\u793A\:\u60A8\u53EF\u4EE5\u901A\u904E\u8F38\
 FR-Designer_FormulaPane_Variables=\u8B8A\u91CF
 FR-Designer_FormulaPane_Formula_Description=\u516C\u5F0F\u8AAA\u660E
 FR-Designer_FormulaPane_Function_Detail=\u51FD\u6578\u660E\u7D30
-FR-Designer_FormulaPane_Search=\u641C\u7D22
+FR-Designer_FormulaPane_Search=\u641C\u7D22
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java

@@ -146,7 +146,8 @@ public class XCardAddButton extends XButton{
     	//设置标题
     	titleButton.setText(getTabTitleName());
         titleButton.setInitialBackground(ColorBackground.getInstance(Color.WHITE));
-    	XCardSwitchButton showButton = new XCardSwitchButton(titleButton,dimension,cardLayout,tagLayout);
+    	XCardSwitchButton showButton = new XCardSwitchButton(titleButton, dimension, cardLayout, tagLayout);
+		titleButton.setCustomStyle(true);
     	titleButton.setShowButton(true);
 		showButton.setBackupParent(tagLayout);
 

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@@ -11,6 +11,7 @@ import java.util.*;
 import javax.swing.*;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.GraphHelper;
 import com.fr.base.background.ColorBackground;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
@@ -353,7 +354,7 @@ public class XCardSwitchButton extends XButton {
             CardSwitchButton tempCard = (CardSwitchButton) temp.toData();
             String tempText = tempCard.getText();
             Font f = ((CardSwitchButton)this.toData()).getFont();
-			FontMetrics fm = Toolkit.getDefaultToolkit().getFontMetrics(f);
+			FontMetrics fm = GraphHelper.getFontMetrics(f);
             cardWidth.put(i,fm.stringWidth(tempText));
             cardHeight.put(i,fm.getHeight());
         }

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

@@ -6,13 +6,16 @@ package com.fr.design.designer.creator.cardlayout;
 import com.fr.base.background.ColorBackground;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRCardLayoutAdapter;
+import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.*;
 import com.fr.design.form.layout.FRCardLayout;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.mainframe.widget.editors.BooleanEditor;
 import com.fr.design.mainframe.widget.editors.CardTagWLayoutBorderStyleEditor;
-import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
+import com.fr.design.mainframe.widget.editors.DoubleEditor;
 import com.fr.form.ui.*;
 import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.WCardLayout;
@@ -22,6 +25,7 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WCardTitleLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.core.PropertyChangeAdapter;
 
@@ -39,6 +43,8 @@ public class XWCardLayout extends XLayoutContainer {
 	private CardLayout cardLayout;
 	private boolean initFlag = true;
 	private static final int NORTH = 0;
+	private FormDesigner designer;
+
 	//默认蓝色标题背景
 	private static final Color TITLE_COLOR = new Color(51, 132, 240);
 
@@ -197,6 +203,7 @@ public class XWCardLayout extends XLayoutContainer {
 		CardSwitchButton firstBtn = new CardSwitchButton(widgetName);
 		firstBtn.setText(Inter.getLocText("FR-Designer_Title") + 0);
 		firstBtn.setInitialBackground(ColorBackground.getInstance(Color.WHITE));
+		firstBtn.setCustomStyle(true);
 		xTag.setCurrentCard(firstBtn);
 		XCardSwitchButton xFirstBtn = new XCardSwitchButton(firstBtn, new Dimension(CardSwitchButton.DEF_WIDTH, -1), this, xTag);
 		xFirstBtn.setBackupParent(xTag);
@@ -271,27 +278,68 @@ public class XWCardLayout extends XLayoutContainer {
 	* @throws IntrospectionException
 	*/
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-	return  new CRPropertyDescriptor[] {
+		CRPropertyDescriptor[] crp = ((WCardLayout) data).isCarousel() ? getisCarousel() : getisnotCarousel();
-                new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
+		return ArrayUtils.addAll(getDefaultDescriptor(), crp);
-                       .getLocText("FR-Designer_Form-Widget_Name")).setPropertyChangeListener(new PropertyChangeAdapter(){
+	}
-                    	   
+
-                    	   @Override
+	public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException {
-                    	   public void propertyChange(){
+		return new CRPropertyDescriptor[] {
-                    		   WCardLayout cardLayout = toData();
+				new CRPropertyDescriptor("carousel", this.data.getClass())
-                    		   changeRalateSwitchCardname(cardLayout.getWidgetName());
+						.setEditorClass(BooleanEditor.class)
-                    	   }
+						.setI18NName(Inter.getLocText("FR-Designer_setCarousel"))
-                       }),
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel")
-               new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
+						.setPropertyChangeListener(new PropertyChangeAdapter() {
-            		   CardTagWLayoutBorderStyleEditor.class).setI18NName(
+					@Override
-                       Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+					public void propertyChange() {
-                       .setPropertyChangeListener(new PropertyChangeAdapter() {
+						designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+						designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);
+					}
+				}),
+				new CRPropertyDescriptor("carouselInterval", this.data.getClass())
+						.setEditorClass(DoubleEditor.class)
+						.setI18NName(Inter.getLocText("FR-Designer_carouselInterval"))
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel")
+		};
+	}
+
+	public CRPropertyDescriptor[] getisnotCarousel() throws IntrospectionException {
+		return new CRPropertyDescriptor[] {
+				new CRPropertyDescriptor("carousel", this.data.getClass())
+						.setEditorClass(BooleanEditor.class)
+						.setI18NName(Inter.getLocText("FR-Designer_setCarousel"))
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel")
+						.setPropertyChangeListener(new PropertyChangeAdapter() {
+					@Override
+					public void propertyChange() {
+						designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+						designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);
+					}
+				})
+		};
+	}
+
+	public CRPropertyDescriptor[] getDefaultDescriptor() throws IntrospectionException {
+		return new CRPropertyDescriptor[] {
+				new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
+						.getLocText("FR-Designer_Form-Widget_Name")).setPropertyChangeListener(new PropertyChangeAdapter(){
+
+					@Override
+					public void propertyChange(){
+						WCardLayout cardLayout = toData();
+						changeRalateSwitchCardname(cardLayout.getWidgetName());
+					}
+				}),
+				new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
+						CardTagWLayoutBorderStyleEditor.class).setI18NName(
+						Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+						.setPropertyChangeListener(new PropertyChangeAdapter() {
 
-                            @Override
+					@Override
-                            public void propertyChange() {
+					public void propertyChange() {
-                           	initStyle();
+						initStyle();
-                           }
+					}
-                        }),
+				})
-                    };
+		};
 	}
 	
 	//初始化样式