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

designer/src/com/fr/design/actions/report/ReportBackgroundAction.java

@@ -37,16 +37,14 @@ public class ReportBackgroundAction extends ReportComponentAction<ReportComponen
         }
         final ReportBackgroundPane bPane = new ReportBackgroundPane();
         bPane.populate(ReportUtils.getReportSettings(reportPane.getTemplateReport()));
-        BasicDialog bDialog = bPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        bPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
 
             @Override
 			public void doOk() {
                 bPane.update(reportPane.getTemplateReport().getReportSettings());
                 reportPane.fireTargetModified();
             }
-        });
+        }).setVisible(true);
-        bDialog.setModal(false);
-        bDialog.setVisible(true);
         return false;
     }
 }

designer/src/com/fr/design/report/mobile/MobileUseHtmlGroupPane.java

@@ -1,109 +1,12 @@
 package com.fr.design.report.mobile;
 
-import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.mobile.MobileUseHtmlGroupBeanPane;
-import com.fr.design.border.UITitledBorder;
-import com.fr.design.gui.ibutton.UIRadioButton;
-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.general.Inter;
 import com.fr.report.mobile.ElementCaseMobileAttr;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by kunsnat on 2016/8/3.
  */
-public class MobileUseHtmlGroupPane extends BasicBeanPane<ElementCaseMobileAttr> {
+public class MobileUseHtmlGroupPane extends MobileUseHtmlGroupBeanPane<ElementCaseMobileAttr> {
-
-    private List<UIRadioButton> radioButtons = new ArrayList<UIRadioButton>();
-
-    public MobileUseHtmlGroupPane() {
-        initComponents();
-    }
-
-    private void initComponents() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(UITitledBorder.createBorderWithTitle(this.title4PopupWindow()));
-
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p};
-        double[] columnSize = {p, p, p};
-
-        UIRadioButton useApp = new UIRadioButton(Inter.getLocText("FR-mobile_native_analysis"));
-        useApp.setSelected(true);
-        UIRadioButton useHTML5 = new UIRadioButton(Inter.getLocText("FR-mobile_html_analysis")); 
-
-        addToButtonGroup(useApp, useHTML5);
-
-        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-mobile_analysis_style")), useApp, useHTML5},
-                new Component[]{new UILabel(Inter.getLocText("FR-mobile_analysis_annotation")), null, null}
-        };
-        JPanel usePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        usePane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10));
-
-        this.add(usePane);
-    }
-
-    private void addToButtonGroup(UIRadioButton... radios) {
-        ButtonGroup buttonGroup = new ButtonGroup();
-        for (UIRadioButton radio : radios) {
-            radioButtons.add(radio);
-            buttonGroup.add(radio);
-        }
-    }
-
-    /**
-     * 设置按钮状态
-     */
-    public void setEnabled(boolean enabled) {
-        for (UIRadioButton radioButton : radioButtons) {
-            radioButton.setEnabled(enabled);
-        }
-    }
-
-    /**
-     * 获取当前选中的按钮index
-     *
-     * @return 按钮index
-     */
-    public int getSelectRadioIndex() {
-        for (int i = 0, len = radioButtons.size(); i < len; i++) {
-            if (radioButtons.get(i).isSelected()) {
-                return i;
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * 选中指定index的按钮
-     */
-    public void selectIndexButton(int index) {
-        if (index < 0 || index > radioButtons.size() - 1) {
-            return;
-        }
-
-        UIRadioButton button = radioButtons.get(index);
-        button.setSelected(true);
-    }
-
-    /**
-     * 给所有的按钮加上监听
-     */
-    public void addActionListener(ActionListener actionListener) {
-        for (UIRadioButton radioButton : radioButtons) {
-            radioButton.addActionListener(actionListener);
-        }
-    }
-
     @Override
     public void populateBean(ElementCaseMobileAttr mobileAttr) {
         if(mobileAttr != null) {
@@ -122,9 +25,4 @@ public class MobileUseHtmlGroupPane extends BasicBeanPane<ElementCaseMobileAttr>
             mobileAttr.setUseHTML(getSelectRadioIndex() == 1);
         }
     }
-
-    @Override
-    protected String title4PopupWindow() {
-        return Inter.getLocText("FR-mobile_report_analysis");
-    }
 }

designer_base/src/com/fr/design/dialog/mobile/MobileUseHtmlGroupBeanPane.java

@@ -0,0 +1,112 @@
+package com.fr.design.dialog.mobile;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.border.UITitledBorder;
+import com.fr.design.gui.ibutton.UIRadioButton;
+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.general.Inter;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 由于MobileUserHtmlGroupPane 现在在report和form中均会用到，会出现重复代码，故放入base中
+ * Created by fanglei on 2016/12/28.
+ */
+public abstract class MobileUseHtmlGroupBeanPane<T> extends BasicBeanPane<T> {
+
+    private List<UIRadioButton> radioButtons = new ArrayList<UIRadioButton>();
+
+    public MobileUseHtmlGroupBeanPane() {
+        initComponents();
+    }
+
+    private void initComponents() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setBorder(UITitledBorder.createBorderWithTitle(this.title4PopupWindow()));
+
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p};
+        double[] columnSize = {p, p, p};
+
+        UIRadioButton useApp = new UIRadioButton(Inter.getLocText("FR-mobile_native_analysis"));
+        useApp.setSelected(true);
+        UIRadioButton useHTML5 = new UIRadioButton(Inter.getLocText("FR-mobile_html_analysis"));
+
+        addToButtonGroup(useApp, useHTML5);
+
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Inter.getLocText("FR-mobile_analysis_style")), useApp, useHTML5},
+                new Component[]{new UILabel(Inter.getLocText("FR-mobile_analysis_annotation")), null, null}
+        };
+        JPanel usePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        usePane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10));
+
+        this.add(usePane);
+    }
+
+    private void addToButtonGroup(UIRadioButton... radios) {
+        ButtonGroup buttonGroup = new ButtonGroup();
+        for (UIRadioButton radio : radios) {
+            radioButtons.add(radio);
+            buttonGroup.add(radio);
+        }
+    }
+
+    /**
+     * 设置按钮状态
+     */
+    public void setEnabled(boolean enabled) {
+        for (UIRadioButton radioButton : radioButtons) {
+            radioButton.setEnabled(enabled);
+        }
+    }
+
+    /**
+     * 获取当前选中的按钮index
+     *
+     * @return 按钮index
+     */
+    public int getSelectRadioIndex() {
+        for (int i = 0, len = radioButtons.size(); i < len; i++) {
+            if (radioButtons.get(i).isSelected()) {
+                return i;
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * 选中指定index的按钮
+     */
+    public void selectIndexButton(int index) {
+        if (index < 0 || index > radioButtons.size() - 1) {
+            return;
+        }
+
+        UIRadioButton button = radioButtons.get(index);
+        button.setSelected(true);
+    }
+
+    /**
+     * 给所有的按钮加上监听
+     */
+    public void addActionListener(ActionListener actionListener) {
+        for (UIRadioButton radioButton : radioButtons) {
+            radioButton.addActionListener(actionListener);
+        }
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Inter.getLocText("FR-mobile_report_analysis");
+    }
+}
+

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

@@ -508,3 +508,13 @@ FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
 FR-Designer_Create_Tree=
 FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+FR-Designer_Background_Null=
+FR-Designer_Background_Color=
+FR-Designer_Background_Texture=
+FR-Designer_Background_Pattern=
+FR-Designer_Background_Gradient_Color=
+FR-Designer_Background_Image=
+FR-Designer_Background_Clear=
+FR-Designer_Background_Image_Select=

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

@@ -508,4 +508,13 @@ FR-Designer_Form_Basic_Properties=Basic Property
 FR-Designer_DS_Dictionary=Data Dictionary
 FR-Designer_Create_Tree=Build Tree
 FR-Designer_Set_Callback_Function=Set Callback Function
-
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+FR-Designer_Background_Null=No Background
+FR-Designer_Background_Color=Color
+FR-Designer_Background_Texture=Texture
+FR-Designer_Background_Pattern=Pattern
+FR-Designer_Background_Gradient_Color=Gradient Color
+FR-Designer_Background_Image=Image
+FR-Designer_Background_Clear=Clear
+FR-Designer_Background_Image_Select=Select Picture

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

@@ -487,3 +487,13 @@ FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
 FR-Designer_Create_Tree=
 FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+FR-Designer_Background_Null=
+FR-Designer_Background_Color=
+FR-Designer_Background_Texture=
+FR-Designer_Background_Pattern=
+FR-Designer_Background_Gradient_Color=
+FR-Designer_Background_Image=
+FR-Designer_Background_Clear=
+FR-Designer_Background_Image_Select=

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

@@ -482,3 +482,13 @@ FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
 FR-Designer_Create_Tree=
 FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+FR-Designer_Background_Null=
+FR-Designer_Background_Color=
+FR-Designer_Background_Texture=
+FR-Designer_Background_Pattern=
+FR-Designer_Background_Gradient_Color=
+FR-Designer_Background_Image=
+FR-Designer_Background_Clear=
+FR-Designer_Background_Image_Select=

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

@@ -512,3 +512,13 @@ FR-Designer_Form_Basic_Properties=\u57FA\u672C\u5C5E\u6027
 FR-Designer_DS_Dictionary=\u6570\u636E\u5B57\u5178
 FR-Designer_Create_Tree=\u6784\u5EFA\u6811
 FR-Designer_Set_Callback_Function=\u8BBE\u7F6E\u56DE\u8C03\u51FD\u6570
+FR-Designer_ConfirmDialog_Content=\u662F\u5426\u786E\u5B9A\u5220\u9664tab\u63A7\u4EF6
+FR-Designer_ConfirmDialog_Title=FineReport 8.0
+FR-Designer_Background_Null=\u6CA1\u6709\u80CC\u666F
+FR-Designer_Background_Color=\u989C\u8272
+FR-Designer_Background_Texture=\u7EB9\u7406
+FR-Designer_Background_Pattern=\u56FE\u6848
+FR-Designer_Background_Gradient_Color=\u6E10\u53D8\u8272
+FR-Designer_Background_Image=\u56FE\u7247
+FR-Designer_Background_Clear=\u6E05\u9664
+FR-Designer_Background_Image_Select=\u9009\u62E9\u56FE\u7247

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

@@ -500,3 +500,13 @@ FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
 FR-Designer_Create_Tree=
 FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+FR-Designer_Background_Null=
+FR-Designer_Background_Color=
+FR-Designer_Background_Texture=
+FR-Designer_Background_Pattern=
+FR-Designer_Background_Gradient_Color=
+FR-Designer_Background_Image=
+FR-Designer_Background_Clear=
+FR-Designer_Background_Image_Select=

designer_base/src/com/fr/design/style/background/BackgroundButtonPane.java

@@ -0,0 +1,53 @@
+package com.fr.design.style.background;
+
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.Background;
+import com.fr.general.Inter;
+
+/**
+ * Created by ibm on 2017/1/5.
+ */
+public class BackgroundButtonPane extends BackgroundPane {
+
+
+    public BackgroundButtonPane() {
+        super();
+    }
+
+    protected void initTabPane() {
+        int index = 0;
+        for (Class<? extends Background> key : BackgroundFactory.buttonKindsOfKey()) {
+            BackgroundUIWrapper wrapper = BackgroundFactory.getButtonWrapper(key);
+            wrapper.setIndex(index++);
+            tabbedPane.addTab(Inter.getLocText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane());
+        }
+    }
+
+    protected BackgroundUIWrapper getBackgroundUIWrapper(Background background) {
+        return BackgroundFactory.getButtonWrapper(background == null ? null : background.getClass());
+    }
+
+    protected BackgroundDetailPane getTabItemPane(Background background, int index) {
+        BackgroundDetailPane quickPane = cacheMap.get(index);
+        if (quickPane == null) {
+            quickPane = BackgroundFactory.createButtonIfAbsent(background == null ? null : background.getClass());
+            quickPane.addChangeListener(backgroundChangeListener);
+            cacheMap.put(index, quickPane);
+        }
+        tabbedPane.setComponentAt(index, quickPane);
+        tabbedPane.setSelectedIndex(index);
+        return quickPane;
+    }
+
+    protected BackgroundDetailPane getTabItemPaneByIndex(int index) {
+        BackgroundDetailPane quickPane = cacheMap.get(index);
+        if (quickPane == null) {
+            quickPane = BackgroundFactory.createButtonIfAbsent(index);
+            tabbedPane.setComponentAt(index, quickPane);
+            cacheMap.put(index, quickPane);
+            quickPane.addChangeListener(backgroundChangeListener);
+        }
+        return quickPane;
+    }
+
+}

designer_base/src/com/fr/design/style/background/BackgroundFactory.java

@@ -3,7 +3,6 @@ package com.fr.design.style.background;
 
 import com.fr.base.background.*;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.fun.BackgroundQuickUIProvider;
 import com.fr.design.fun.BackgroundUIProvider;
 import com.fr.design.style.background.gradient.GradientBackgroundPane;
 import com.fr.design.style.background.impl.*;
@@ -21,6 +20,7 @@ public class BackgroundFactory {
 
     private static Map<Class<? extends Background>, BackgroundUIWrapper> map = new LinkedHashMap<>();
     private static Map<Class<? extends Background>, BackgroundUIWrapper> browser = new LinkedHashMap<>();
+    private static Map<Class<? extends Background>, BackgroundUIWrapper> button = new LinkedHashMap<>();
 
     static {
         registerUniversal(map);
@@ -29,29 +29,38 @@ public class BackgroundFactory {
         registerBrowserImageBackground(browser);
         registerExtra(map);
         registerExtra(browser);
+        registerButtonBackground(button);
     }
 
     private static void registerUniversal(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
         map.put(null, BackgroundUIWrapper.create()
-                .setType(NullBackgroundPane.class).setTitle(Inter.getLocText("Background-Null")));
+                .setType(NullBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Null")));
         map.put(ColorBackground.class, BackgroundUIWrapper.create()
-                .setType(ColorBackgroundPane.class).setTitle(Inter.getLocText("Color")));
+                .setType(ColorBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Color")));
         map.put(TextureBackground.class, BackgroundUIWrapper.create()
-                .setType(TextureBackgroundPane.class).setTitle(Inter.getLocText("Background-Texture")));
+                .setType(TextureBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Texture")));
         map.put(PatternBackground.class, BackgroundUIWrapper.create()
-                .setType(PatternBackgroundPane.class).setTitle(Inter.getLocText("Background-Pattern")));
+                .setType(PatternBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Pattern")));
         map.put(GradientBackground.class, BackgroundUIWrapper.create()
-                .setType(GradientBackgroundPane.class).setTitle(Inter.getLocText("Gradient-Color")));
+                .setType(GradientBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Gradient_Color")));
     }
 
     private static void registerImageBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
         map.put(ImageBackground.class, BackgroundUIWrapper.create()
-                .setType(ImageBackgroundPane.class).setTitle(Inter.getLocText("Image")));
+                .setType(ImageBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Image")));
     }
 
     private static void registerBrowserImageBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
         map.put(ImageBackground.class, BackgroundUIWrapper.create()
-                .setType(ImageBackgroundPane4Browser.class).setTitle(Inter.getLocText("Image")));
+                .setType(ImageBackgroundPane4Browser.class).setTitle(Inter.getLocText("FR-Designer_Background_Image")));
+    }
+
+    private static void registerButtonBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map){
+        map.put(ColorBackground.class, BackgroundUIWrapper.create()
+                .setType(ColorBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Color")));
+        map.put(ImageBackground.class, BackgroundUIWrapper.create()
+                .setType(ImageButtonBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Image")));
+
     }
 
     private static void registerExtra(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
@@ -85,6 +94,29 @@ public class BackgroundFactory {
         return new NullBackgroundPane();
     }
 
+    public static Set<Class<? extends Background>> buttonKindsOfKey() {
+        return button.keySet();
+    }
+
+    public static BackgroundUIWrapper getButtonWrapper(Class<? extends Background> category) {
+        return button.get(category);
+    }
+
+    public static BackgroundDetailPane createButtonIfAbsent(Class<? extends Background> category) {
+        BackgroundUIWrapper wrapper = button.get(category);
+        return createByWrapper(wrapper);
+    }
+
+    public static BackgroundDetailPane createButtonIfAbsent(int index) {
+        for (BackgroundUIWrapper wrapper : button.values()) {
+            if (wrapper.getIndex() == index) {
+                return createByWrapper(wrapper);
+            }
+        }
+        return new NullBackgroundPane();
+    }
+
+
     public static Set<Class<? extends Background>> browserKindsOfKey() {
         return browser.keySet();
     }

designer_base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java

@@ -28,16 +28,16 @@ import java.io.File;
  */
 public class ImageBackgroundPane extends BackgroundDetailPane {
 
-    private ImagePreviewPane previewPane = null;
+    protected ImagePreviewPane previewPane = null;
     private Style imageStyle = null;
     private ChangeListener changeListener = null;
     private ImageFileChooser imageFileChooser = null;
-    private UILabel imageSizeLabel = new UILabel();
+    protected UILabel imageSizeLabel = new UILabel();
 
-    protected JRadioButton defaultRadioButton = null;
+    protected UIRadioButton defaultRadioButton = null;
-    protected JRadioButton tiledRadioButton = null;
+    protected UIRadioButton tiledRadioButton = null;
-    private JRadioButton extendRadioButton = null;
+    private UIRadioButton extendRadioButton = null;
-    private JRadioButton adjustRadioButton = null;
+    private UIRadioButton adjustRadioButton = null;
 
     public ImageBackgroundPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -46,21 +46,27 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
         JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.add(previewContainerPane, BorderLayout.CENTER);
 
-        JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Preview"));
+        JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Preview"));
         previewOwnerPane.setLayout(new BorderLayout());
         previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER);
-
+        previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST);
-
         previewPane = new ImagePreviewPane();
         previewOwnerPane.add(new JScrollPane(previewPane));
         previewPane.addChangeListener(imageSizeChangeListener);
 
+
+        // init image file chooser.
+        imageFileChooser = new ImageFileChooser();
+        imageFileChooser.setMultiSelectionEnabled(false);
+    }
+
+    public JPanel initSelectFilePane(){
         JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        previewContainerPane.add(selectFilePane, BorderLayout.EAST);
+
         selectFilePane.setBorder(BorderFactory.createEmptyBorder(8, 2, 4, 0));
 
         UIButton selectPictureButton = new UIButton(
-                Inter.getLocText("Image-Select_Picture"));
+                Inter.getLocText("FR-Designer_Background_Image_Select"));
         selectFilePane.add(selectPictureButton, BorderLayout.NORTH);
         selectPictureButton.setMnemonic('S');
         selectPictureButton.addActionListener(selectPictureActionListener);
@@ -68,10 +74,10 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
         selectFilePane.add(layoutPane, BorderLayout.CENTER);
 
         //布局
-        defaultRadioButton = new UIRadioButton(Inter.getLocText("Default"));
+        defaultRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-StyleAlignment_Layout_Default"));
-        tiledRadioButton = new UIRadioButton(Inter.getLocText("Image-Titled"));
+        tiledRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Titled"));
-        extendRadioButton = new UIRadioButton(Inter.getLocText("Image-Extend"));
+        extendRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Extend"));
-        adjustRadioButton = new UIRadioButton(Inter.getLocText("Image-Adjust"));
+        adjustRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Adjust"));
 
         defaultRadioButton.addActionListener(layoutActionListener);
         tiledRadioButton.addActionListener(layoutActionListener);
@@ -79,7 +85,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
         adjustRadioButton.addActionListener(layoutActionListener);
 
         JPanel jp = new JPanel(new GridLayout(4, 1, 15, 15));
-        for (JRadioButton button : imageLayoutButtons()) {
+        for (UIRadioButton button : imageLayoutButtons()) {
             jp.add(button);
         }
         layoutPane.add(jp);
@@ -91,14 +97,11 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
         layoutBG.add(adjustRadioButton);
 
         defaultRadioButton.setSelected(true);
-
+        return selectFilePane;
-        // init image file chooser.
-        imageFileChooser = new ImageFileChooser();
-        imageFileChooser.setMultiSelectionEnabled(false);
     }
 
-    protected JRadioButton[] imageLayoutButtons() {
+    protected UIRadioButton[] imageLayoutButtons() {
-        return new JRadioButton[]{
+        return new UIRadioButton[]{
                 defaultRadioButton,
                 tiledRadioButton,
                 extendRadioButton,
@@ -121,8 +124,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
                     CoreGraphHelper.waitForImage(image);
 
                     previewPane.setImage(image);
-                    setImageStyle();
+                    imageStyleRepaint();
-                    previewPane.setImageStyle(imageStyle);
                     previewPane.repaint();
                 } else {
                     previewPane.setImage(null);
@@ -133,6 +135,11 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
         }
     };
 
+    public void imageStyleRepaint(){
+        setImageStyle();
+        previewPane.setImageStyle(imageStyle);
+    }
+
     private void setImageStyle() {
         if (tiledRadioButton.isSelected()) {
             imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_TILED);

designer_base/src/com/fr/design/style/background/impl/ImageBackgroundPane4Browser.java

@@ -1,5 +1,6 @@
 package com.fr.design.style.background.impl;
 
+import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
@@ -15,9 +16,9 @@ public class ImageBackgroundPane4Browser extends ImageBackgroundPane {
     }
 
     @Override
-    protected JRadioButton[] imageLayoutButtons() {
+    protected UIRadioButton[] imageLayoutButtons() {
 
-        return (JRadioButton[]) ArrayUtils.addAll(super.imageLayoutButtons(), new JRadioButton[] {
+        return (UIRadioButton[]) ArrayUtils.addAll(super.imageLayoutButtons(), new UIRadioButton[] {
                 defaultRadioButton,
                 tiledRadioButton,
         });

designer_base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java

@@ -0,0 +1,79 @@
+package com.fr.design.style.background.impl;
+
+import com.fr.base.Style;
+import com.fr.base.background.ImageBackground;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.general.Background;
+import com.fr.general.Inter;
+import com.fr.stable.Constants;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Created by ibm on 2017/1/5.
+ */
+public class ImageButtonBackgroundPane extends ImageBackgroundPane {
+    private UIButton chooseButton;
+    private UIButton clearButton;
+
+    public ImageButtonBackgroundPane(){
+        super();
+        Style imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_CENTER);
+        previewPane.setImageStyle(imageStyle);
+    }
+
+    public JPanel initSelectFilePane(){
+
+        JPanel choosePane = new JPanel(new BorderLayout(0, 10));
+        choosePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+        JPanel choosePane1 = new JPanel(new BorderLayout(0, 10));
+        initButton();
+
+        choosePane.add(chooseButton, BorderLayout.NORTH);
+
+        choosePane1.add(clearButton,BorderLayout.NORTH);
+        choosePane.add(choosePane1,BorderLayout.CENTER);
+
+        imageSizeLabel.setHorizontalAlignment(SwingConstants.CENTER);
+        choosePane1.add(imageSizeLabel,BorderLayout.CENTER);
+        this.add(choosePane,BorderLayout.EAST);
+
+        return choosePane;
+    }
+
+    private void initButton() {
+        chooseButton = new UIButton(Inter.getLocText("FR-Designer_Background_Image_Select"));
+        chooseButton.addActionListener(selectPictureActionListener);
+        clearButton = new UIButton(Inter.getLocText("FR-Designer_Background_Clear"));
+        clearButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                previewPane.setImage(null);
+                previewPane.repaint();
+            }
+        });
+    }
+
+    public void imageStyleRepaint(){
+
+    }
+
+
+    public void populate(Background background) {
+        if(background != null && background instanceof ImageBackground){
+            ImageBackground imageBackground = (ImageBackground) background;
+            if(imageBackground.getImage() != null) {
+                previewPane.setImage(imageBackground.getImage());
+            }
+        }
+
+    }
+
+    public Background update() {
+        if(previewPane.getImage() == null) {
+            return null;
+        }
+        return new ImageBackground(previewPane.getImage());
+    }
+}

designer_base/src/com/fr/design/style/color/ColorPicker.java

@@ -5,6 +5,7 @@ package com.fr.design.style.color;
  */
 
 import com.fr.base.BaseUtils;
+import com.fr.general.FRLogger;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -49,7 +50,10 @@ public class ColorPicker extends JDialog implements ActionListener
         updateSize(colorPickerSize);
         this.colorSelectable = colorSelectable;
         this.setColorRealTime = setColorRealTime;
+        start();
+        this.setModal(true);
         this.setAlwaysOnTop(true);
+        updateLocation();
         this.setVisible(true);
         this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
     }
@@ -58,6 +62,18 @@ public class ColorPicker extends JDialog implements ActionListener
         timer = new Timer(timeCycle, this);
         timer.start();
         hideCursor();
+
+        // 如果要求实时变化，确保先关闭弹窗，再截屏
+        // 主要针对"图案"选项卡中的"前景"、"背景"
+        if (this.setColorRealTime) {
+            colorSelectable.setColor(Color.WHITE);  // setColor 可以关闭弹窗
+            try {
+                Thread.sleep(100);  // 等待弹窗关闭
+            } catch (InterruptedException e) {
+                FRLogger.getLogger().error(e.getMessage());
+            }
+            colorPickerPanel.captureScreen();
+        }
 //        System.out.println(KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow());
     }
 
@@ -68,7 +84,7 @@ public class ColorPicker extends JDialog implements ActionListener
     public void actionPerformed(ActionEvent e) {
         updateLocation();
         colorToSet = colorPickerPanel.getPixelColor(mousePos);
-        if (setColorRealTime && !colorSelectable.getColor().equals(colorToSet)) {
+        if (setColorRealTime && (colorSelectable.getColor() == null || !colorSelectable.getColor().equals(colorToSet))) {
             colorSelectable.setColor(colorToSet);
         }
     }
@@ -94,9 +110,11 @@ public class ColorPicker extends JDialog implements ActionListener
         validate();    // 更新所有子控件
     }
 
-    public void pickComplete() {
+    public void pickComplete(boolean setColor) {
         timer.stop();
+        if (setColor) {
             colorSelectable.setColor(colorToSet);
+        }
         this.dispose();
     }
 
@@ -109,9 +127,8 @@ public class ColorPicker extends JDialog implements ActionListener
 
     private class MouseFunctions extends MouseAdapter
     {
-        public void mousePressed(MouseEvent e)
+        public void mousePressed(MouseEvent e) {
-        {
+            pickComplete(e.getButton() == e.BUTTON1);  // 左键确定
-            pickComplete();
         }
     }
 }
@@ -138,6 +155,15 @@ class ColorPickerPanel extends JPanel
      */
     public ColorPickerPanel(int scaleFactor)
     {
+        colorPickerFrame = BaseUtils.readImage("/com/fr/design/images/gui/colorPicker/colorPickerFrame.png");
+        this.scaleFactor = scaleFactor;
+        captureScreen();
+    }
+
+    /**
+     * 截屏
+     */
+    public void captureScreen() {
         try
         {
             robot = new Robot();
@@ -149,8 +175,6 @@ class ColorPickerPanel extends JPanel
         screenImage = robot.createScreenCapture(new Rectangle(0, 0, Toolkit
                 .getDefaultToolkit().getScreenSize().width, Toolkit
                 .getDefaultToolkit().getScreenSize().height));
-        colorPickerFrame = BaseUtils.readImage("/com/fr/design/images/gui/colorPicker/colorPickerFrame.png");
-        this.scaleFactor = scaleFactor;
     }
 
     /**

designer_base/src/com/fr/design/style/color/ColorSelectDialog.java

@@ -137,7 +137,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
 	public static void showDialog(Frame owner,ColorSelectDetailPane pane,Color initialColor,ColorSelectable selectePane){
 		ColorTracker okListener = new ColorTracker(pane);
 		ColorSelectDialog dialog = new ColorSelectDialog(owner,pane,initialColor,okListener,selectePane);
-//		dialog.setModal(true);
+		dialog.setModal(true);
 		dialog.show();
 	}
 

designer_base/src/com/fr/design/style/color/PickColorButtonFactory.java

@@ -4,8 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.UIButton;
 
 import java.awt.*;
-import java.awt.event.ActionEvent;
+import java.awt.event.*;
-import java.awt.event.ActionListener;
 
 /**
  * Created by plough on 2016/12/22.
@@ -28,11 +27,10 @@ public class PickColorButtonFactory {
         }
         pickColorButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
 
-        pickColorButton.addActionListener(new ActionListener() {
+        pickColorButton.addMouseListener(new MouseAdapter() {
             @Override
-            public void actionPerformed(ActionEvent e) {
+            public void mousePressed(MouseEvent e) {
-                ColorPicker colorPicker = new ColorPicker(colorSelectable, setColorRealTime);
+                new ColorPicker(colorSelectable, setColorRealTime);
-                colorPicker.start();
             }
         });
 

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

@@ -1,13 +1,12 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import java.awt.Dimension;
+import java.awt.*;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.event.MouseEvent;
 
 import javax.swing.Icon;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.background.ColorBackground;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.models.SelectionModel;
@@ -147,8 +146,8 @@ public class XCardAddButton extends XButton{
     	CardSwitchButton titleButton = new CardSwitchButton(index,cardLayoutName);
     	//设置标题
     	titleButton.setText(getTabTitleName());
+		titleButton.setInitialBackground(ColorBackground.getInstance(Color.WHITE));
     	XCardSwitchButton showButton = new XCardSwitchButton(titleButton,dimension,cardLayout,tagLayout);
-    	titleButton.setCustomStyle(true);
     	titleButton.setShowButton(true);
 		showButton.setBackupParent(tagLayout);
 
@@ -162,6 +161,8 @@ public class XCardAddButton extends XButton{
 	private void showNewTab(EditingMouseListener editingMouseListener,int index){
 		SelectionModel selectionModel = editingMouseListener.getSelectionModel();
 		XWTabFitLayout tabFitLayout = (XWTabFitLayout) cardLayout.getComponent(index);
+		XCardSwitchButton xCardSwitchButton = (XCardSwitchButton) this.tagLayout.getComponent(index);
+		tabFitLayout.setxCardSwitchButton(xCardSwitchButton);
 		selectionModel.setSelectedCreator(tabFitLayout);
 	}
 	

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

@@ -11,7 +11,7 @@ import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
 
-import javax.swing.Icon;
+import javax.swing.*;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.background.ColorBackground;
@@ -33,6 +33,7 @@ import com.fr.form.ui.WidgetTitle;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
 import com.fr.general.Background;
 import com.fr.general.FRFont;
+import com.fr.general.Inter;
 
 /**
  *
@@ -41,10 +42,14 @@ import com.fr.general.FRFont;
  */
 public class XCardSwitchButton extends XButton {
 
-	private XWCardLayout cardLayout;
-	private XWCardTagLayout tagLayout;
-	
 	private static final int LEFT_GAP = 16;
+	private static Icon MOUSE_COLSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
+
+	//设置的图片类型
+	private static final String COLORBACKGROUNDTYPE = "ColorBackground";
+	private static final String DEFAULTTYPE = "default";
+
+	//默认颜色
 	public static final Color NORMAL_GRAL = new Color(236,236,236);
 	public static final Color CHOOSED_GRAL = new Color(222,222,222);
 
@@ -57,9 +62,13 @@ public class XCardSwitchButton extends XButton {
 	// tab按钮里的字体因为按钮内部的布局看起来比正常的要小，加个调整量
 	private static final int FONT_SIZE_ADJUST = 2;
 
+	private XWCardLayout cardLayout;
+	private XWCardTagLayout tagLayout;
+
+	private Background selectBackground;
+	private boolean isCustomStyle;
 
 
-	private static Icon MOUSE_COLSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
 	private Icon closeIcon = MOUSE_COLSE;
 	
 	public XWCardTagLayout getTagLayout() {
@@ -78,6 +87,22 @@ public class XCardSwitchButton extends XButton {
 		this.cardLayout = cardLayout;
 	}
 
+	public boolean isCustomStyle() {
+		return isCustomStyle;
+	}
+
+	public void setCustomStyle(boolean customStyle) {
+		isCustomStyle = customStyle;
+	}
+
+	public Background getSelectBackground() {
+		return selectBackground;
+	}
+
+	public void setSelectBackground(Background selectBackground) {
+		this.selectBackground = selectBackground;
+	}
+
 	public XCardSwitchButton(CardSwitchButton widget, Dimension initSize) {
 		super(widget, initSize);
 	}
@@ -133,6 +158,7 @@ public class XCardSwitchButton extends XButton {
 		
 		// 切换到当前tab按钮对应的tabFitLayout
 		XWTabFitLayout tabFitLayout = (XWTabFitLayout) cardLayout.getComponent(index);
+		tabFitLayout.setxCardSwitchButton(this);
 		selectionModel.setSelectedCreator(tabFitLayout);
 		
 		if (editingMouseListener.stopEditing()) {
@@ -146,6 +172,12 @@ public class XCardSwitchButton extends XButton {
 	
 	//删除card，同时修改其他switchbutton和tabfit的index
 	private void deleteCard(XCardSwitchButton button,int index){
+		String titleName = button.getContentLabel().getText();
+		int value = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer_ConfirmDialog_Content") + "“" + titleName + "”",
+				Inter.getLocText("FR-Designer_ConfirmDialog_Title"),JOptionPane.YES_NO_OPTION);
+		if (value != JOptionPane.OK_OPTION) {
+			return;
+		}
 		tagLayout.remove(button);
 		// 先清除该tab内部组件，否在再显示上有样式的残留
 		XWTabFitLayout tabLayout = (XWTabFitLayout)cardLayout.getComponent(index);
@@ -241,6 +273,11 @@ public class XCardSwitchButton extends XButton {
 	//画背景
 	private void drawBackgorund(){
         CardSwitchButton button = (CardSwitchButton)this.toData();
+		Background currentBackground;
+		currentBackground = this.getSelectBackground();
+		//这边就是button的背景图片,图片的是image,默认的是color,所以不应该是针对null的判断
+		String type = currentBackground != null? currentBackground.getBackgroundType() : DEFAULTTYPE;
+		if (type.equals(COLORBACKGROUNDTYPE) || type.equals(DEFAULTTYPE)) {
 			ColorBackground background;
 			if(button.isShowButton()){
 				this.rebuid();
@@ -252,6 +289,7 @@ public class XCardSwitchButton extends XButton {
 				this.setContentBackground(background);
 			}
 		}
+	}
 	
 	//画标题
 	private void drawTitle() {
@@ -272,10 +310,12 @@ public class XCardSwitchButton extends XButton {
 		label.setForeground(font.getForeground());
 		Background background = title.getBackground();
 		if (background != null) {
-			if(button.isShowButton()){
+			if(button.isShowButton() && selectBackground != null){
+				this.setContentBackground(selectBackground);
+			}else if (button.isShowButton() && selectBackground == null){
 				background = ColorBackground.getInstance(CHOOSED_GRAL);
 				this.setContentBackground(background);
-			}else{
+			} else {
 				this.setContentBackground(background);
 			}
 		}

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

@@ -1,12 +1,11 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import java.awt.Component;
+import java.awt.*;
-import java.awt.Dimension;
-import java.awt.Rectangle;
 import java.beans.IntrospectionException;
 
 import javax.swing.border.Border;
 
+import com.fr.base.background.ColorBackground;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRTabFitLayoutAdapter;
 import com.fr.design.designer.beans.models.SelectionModel;
@@ -14,19 +13,24 @@ import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWFitLayout;
-import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
-import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
+import com.fr.design.mainframe.widget.editors.ButtonTypeEditor;
-import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
+import com.fr.design.mainframe.widget.editors.FontEditor;
+import com.fr.design.mainframe.widget.editors.ImgBackgroundEditor;
+import com.fr.design.mainframe.widget.renderer.FontCellRenderer;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
+import com.fr.general.Background;
 import com.fr.general.Inter;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.core.PropertyChangeAdapter;
+
 
 /**
  * @author focus
@@ -37,8 +41,13 @@ public class XWTabFitLayout extends XWFitLayout {
 	private static final int MIN_SIZE = 1;
 	// tab布局在拖拽导致的缩放里（含间隔时），如果拖拽宽高大于组件宽高，会导致调整的时候找不到原来的组件
 	// 这里先将拖拽之前的宽高先做备份
+	public static final Color NORMAL_GRAL = new Color(236,236,236);
+	public static final Color CHOOSED_GRAL = new Color(222,222,222);
 	private Dimension referDim;
-	
+	private Background initialBackground;
+	private Background overBackground;
+	private Background clickBackground;
+	private XCardSwitchButton xCardSwitchButton;
 
 	public Dimension getReferDim() {
 		return referDim;
@@ -48,6 +57,38 @@ public class XWTabFitLayout extends XWFitLayout {
 		this.referDim = referDim;
 	}
 
+	public Background getInitialBackground() {
+		return initialBackground;
+	}
+
+	public void setInitialBackground(Background initialBackground) {
+		this.initialBackground = initialBackground;
+	}
+
+	public Background getOverBackground() {
+		return overBackground;
+	}
+
+	public void setOverBackground(Background overBackground) {
+		this.overBackground = overBackground;
+	}
+
+	public Background getClickBackground() {
+		return clickBackground;
+	}
+
+	public void setClickBackground(Background clickBackground) {
+		this.clickBackground = clickBackground;
+	}
+
+	public XCardSwitchButton getxCardSwitchButton() {
+		return xCardSwitchButton;
+	}
+
+	public void setxCardSwitchButton(XCardSwitchButton xCardSwitchButton) {
+		this.xCardSwitchButton = xCardSwitchButton;
+	}
+
 	public XWTabFitLayout(){
 		this(new WTabFitLayout(), new Dimension());
 	}
@@ -62,15 +103,118 @@ public class XWTabFitLayout extends XWFitLayout {
 	* @throws IntrospectionException
 	*/
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-	return  new CRPropertyDescriptor[] {
+		checkButonType();
-				new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
+		CRPropertyDescriptor[] crp = ((WTabFitLayout) data).isCustomStyle() ? getisCustomStyle() : getisnotCustomStyle();
-					        .getLocText("FR-Designer_Form-Widget_Name")),
+		return ArrayUtils.addAll(super.supportedDescriptor(), crp);
-                new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
+	}
-                       .setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
+
-                       .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+	protected CRPropertyDescriptor[] getisCustomStyle() throws IntrospectionException {
+		return new CRPropertyDescriptor[]{
+				//标题样式
+				creatNonListenerStyle(0).setPropertyChangeListener(new PropertyChangeAdapter() {
+					@Override
+					public void propertyChange() {
+						checkButonType();
+					}
+				}),
+				//初始背景
+				creatNonListenerStyle(1).setPropertyChangeListener(new PropertyChangeAdapter() {
+					@Override
+					public void propertyChange() {
+						initialBackground = ((WTabFitLayout) data).getInitialBackground();
+						xCardSwitchButton.setSelectBackground(null);
+						xCardSwitchButton.setSelectBackground(initialBackground);
+						CardSwitchButton cardSwitchButton = (CardSwitchButton) xCardSwitchButton.toData();
+						cardSwitchButton.setInitialBackground(initialBackground);
+					}
+				}),
+				//鼠标浮动背景
+				creatNonListenerStyle(2).setPropertyChangeListener(
+						new PropertyChangeAdapter() {
+							@Override
+							public void propertyChange() {
+								overBackground = ((WTabFitLayout) data).getOverBackground();
+								CardSwitchButton cardSwitchButton = (CardSwitchButton) xCardSwitchButton.toData();
+								cardSwitchButton.setOverBackground(overBackground);
+							}
+						}),
+				//鼠标点击背景
+				creatNonListenerStyle(3).setPropertyChangeListener(
+						new PropertyChangeAdapter() {
+							@Override
+							public void propertyChange() {
+								clickBackground = ((WTabFitLayout) data).getClickBackground();
+								CardSwitchButton cardSwitchButton = (CardSwitchButton) xCardSwitchButton.toData();
+								cardSwitchButton.setClickBackground(clickBackground);
+							}
+						}
+				),
+				//字体
+				creatNonListenerStyle(4).setPropertyChangeListener(
+						new PropertyChangeAdapter() {
+							@Override
+							public void propertyChange() {
+							}
+						}),
 		};
 	}
 
+	protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException {
+		return new CRPropertyDescriptor[]{
+				new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
+						Inter.getLocText(new String[]{"Title", "Style"})).setEditorClass(
+						ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+						.setPropertyChangeListener(new PropertyChangeAdapter() {
+					@Override
+					public void propertyChange() {
+						checkButonType();
+					}
+				})
+		};
+
+	}
+
+	protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{
+		CRPropertyDescriptor[] crPropertyDescriptors = {
+				new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName(
+						Inter.getLocText(new String[]{"Title", "Style"})).setEditorClass(
+						ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+				new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass(
+						ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Initial")).putKeyValue(
+						XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+				new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass(
+						ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Over")).putKeyValue(
+						XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+				new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass(
+						ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Click")).putKeyValue(
+						XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+				new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_FRFont"))
+						.setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue(
+						XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+		};
+		return crPropertyDescriptors[i];
+	}
+
+	private void checkButonType() {
+		if (this.xCardSwitchButton == null) {
+			return;
+		}
+		boolean isStyle = ((WTabFitLayout) data).isCustomStyle();
+		Background bg;
+		bg = ColorBackground.getInstance(NORMAL_GRAL);
+		if (!isStyle) {
+			this.xCardSwitchButton.setCustomStyle(false);
+			this.xCardSwitchButton.setSelectBackground(bg);
+		} else {
+			CardSwitchButton cardSwitchButton = (CardSwitchButton) this.xCardSwitchButton.toData();
+			Background initialBackground = cardSwitchButton.getInitialBackground();
+			bg = initialBackground == null ? bg : initialBackground;
+			this.xCardSwitchButton.setSelectBackground(bg);
+			this.xCardSwitchButton.setCustomStyle(true);
+			cardSwitchButton.setCustomStyle(true);
+		}
+	}
+
 	@Override
 	public LayoutAdapter getLayoutAdapter() {
 		return new FRTabFitLayoutAdapter(this);

designer_form/src/com/fr/design/form/mobile/FormMobileAttrPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.form.mobile;
 
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.form.main.mobile.FormMobileAttr;
 import com.fr.general.Inter;
@@ -15,22 +16,34 @@ public class FormMobileAttrPane extends BasicBeanPane<FormMobileAttr>{
     //工具栏容器
     private MobileToolBarPane mobileToolBarPane;
 
-    static final int paddingHeight = 10;
+    //h5解析容器
+    private MobileUseHtmlGroupPane mobileUseHtmlGroupPane;
+
+    static final int PADDINGHEIGHT = 10;
 
     public FormMobileAttrPane() {
         this.initComponents();
     }
 
+    //现在只有两个panel，填不满自适应对话框，只能为工具栏Panel和h5解析方式panel分别包裹上一层Panel再计算高度，不然会自动
+    //拉长两个Panel的高度去填满整个对话框。
     private void initComponents() {
-        JPanel jPanel = new JPanel();
+        JPanel jPanel1 = new JPanel();
+        JPanel jPanel2 = new JPanel();
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        jPanel1.setLayout(FRGUIPaneFactory.createBorderLayout());
-        jPanel.setLayout(FRGUIPaneFactory.createBorderLayout());
+        jPanel1.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        jPanel2.setLayout(FRGUIPaneFactory.createBorderLayout());
+        jPanel2.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
         this.mobileToolBarPane = new MobileToolBarPane();
+        this.mobileUseHtmlGroupPane = new MobileUseHtmlGroupPane();
         //设置一个JPanel包裹mobileToolBarPane这个Panel，让jPanel的高度等于mobileToolBarPane高度加10，再放入this中
-        jPanel.setPreferredSize(new Dimension(0, (int)this.mobileToolBarPane.getPreferredSize().getHeight() + paddingHeight));
+        jPanel1.setPreferredSize(new Dimension(0, (int)this.mobileToolBarPane.getPreferredSize().getHeight() + PADDINGHEIGHT));
-        jPanel.add("North", mobileToolBarPane);
+        jPanel2.setPreferredSize(new Dimension(0, (int)this.mobileUseHtmlGroupPane.getPreferredSize().getHeight() + PADDINGHEIGHT));
-        this.add(jPanel);
+        jPanel1.add("North", this.mobileUseHtmlGroupPane);
+        jPanel2.add("North", this.mobileToolBarPane);
+        this.add("North", jPanel1);
+        this.add("Center", jPanel2);
     }
 
     @Override
@@ -39,13 +52,15 @@ public class FormMobileAttrPane extends BasicBeanPane<FormMobileAttr>{
             ob = new FormMobileAttr();
         }
         this.mobileToolBarPane.populateBean(ob);
+        this.mobileUseHtmlGroupPane.populateBean(ob);
     }
 
     @Override
     public FormMobileAttr updateBean() {
-        FormMobileAttr caseMobileAttr = new FormMobileAttr();
+        FormMobileAttr formMobileAttr = new FormMobileAttr();
-        this.mobileToolBarPane.updateBean(caseMobileAttr);
+        this.mobileToolBarPane.updateBean(formMobileAttr);
-        return caseMobileAttr;
+        this.mobileUseHtmlGroupPane.updateBean(formMobileAttr);
+        return formMobileAttr;
     }
 
     @Override

designer_form/src/com/fr/design/form/mobile/MobileUseHtmlGroupPane.java

@@ -0,0 +1,29 @@
+package com.fr.design.form.mobile;
+
+import com.fr.design.dialog.mobile.MobileUseHtmlGroupBeanPane;
+import com.fr.form.main.mobile.FormMobileAttr;
+
+/**
+ * 直接copyreport中的MobileUseHtmlGroupPane
+ * Created by fanglei on 2016/12/28.
+ */
+public class MobileUseHtmlGroupPane extends MobileUseHtmlGroupBeanPane<FormMobileAttr> {
+    @Override
+    public void populateBean(FormMobileAttr mobileAttr) {
+        if(mobileAttr != null) {
+            selectIndexButton(mobileAttr.isUseHTML() ? 1 : 0);
+        }
+    }
+
+    @Override
+    public FormMobileAttr updateBean() {
+        return null;
+    }
+
+    @Override
+    public void updateBean(FormMobileAttr mobileAttr) {
+        if(mobileAttr != null) {
+            mobileAttr.setUseHTML(getSelectRadioIndex() == 1);
+        }
+    }
+}

designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleImgBackgroundEditor.java

@@ -1,17 +1,16 @@
 package com.fr.design.mainframe.widget.accessibles;
 
 import java.awt.Dimension;
-
 import javax.swing.SwingUtilities;
-
+import com.fr.base.background.ColorBackground;
-import com.fr.base.background.ImageBackground;
 import com.fr.design.mainframe.widget.wrappers.BackgroundWrapper;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.gui.frpane.ImgChoosePane;
+import com.fr.design.style.background.BackgroundButtonPane;
+import com.fr.general.Background;
 
 public class AccessibleImgBackgroundEditor extends UneditableAccessibleEditor {
-	private ImgChoosePane choosePane;
+	private BackgroundButtonPane choosePane;
 	
 	public AccessibleImgBackgroundEditor() {
 		super(new BackgroundWrapper());
@@ -20,7 +19,7 @@ public class AccessibleImgBackgroundEditor extends UneditableAccessibleEditor {
 	@Override
 	protected void showEditorPane() {
 		if (choosePane == null) {
-			choosePane = new ImgChoosePane();
+			choosePane = new BackgroundButtonPane();
 			choosePane.setPreferredSize(new Dimension(600, 400));
 		}
 		BasicDialog dlg = choosePane.showWindow(SwingUtilities.getWindowAncestor(this));
@@ -32,7 +31,7 @@ public class AccessibleImgBackgroundEditor extends UneditableAccessibleEditor {
 				fireStateChanged();
 			}
 		});
-		choosePane.populate(getValue() instanceof ImageBackground ? (ImageBackground) getValue() : null);
+		choosePane.populate(getValue() instanceof Background ? (Background) getValue() : new ColorBackground());
 		dlg.setVisible(true);
 	}
 }