Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~plough/design into release/9.0

7 years ago · d9244f371a
13 changed files with 97 additions and 84 deletions
--- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
@ -16,15 +16,13 @@ import com.fr.design.mainframe.alphafine.cell.model.PluginModel;
 import com.fr.design.mainframe.alphafine.cell.render.ContentCellRender;
 import com.fr.design.mainframe.alphafine.listener.DocumentAdapter;
 import com.fr.design.mainframe.alphafine.model.SearchResult;
-import com.fr.design.mainframe.alphafine.preview.ActionPreviewPane;
-import com.fr.design.mainframe.alphafine.preview.DocumentPreviewPane;
-import com.fr.design.mainframe.alphafine.preview.FilePreviewPane;
-import com.fr.design.mainframe.alphafine.preview.PluginPreviewPane;
+import com.fr.design.mainframe.alphafine.preview.*;
 import com.fr.design.mainframe.alphafine.search.manager.*;
 import com.fr.form.main.Form;
 import com.fr.form.main.FormIO;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.general.http.HttpClient;
 import com.fr.io.TemplateWorkBookIO;
@ -75,6 +73,7 @@ public class AlphaFineDialog extends UIDialog {
    private JPanel searchResultPane;
    private Point pressedPoint;
    private UIScrollPane leftSearchResultPane;
+    private JPanel defaultPane;
    private JPanel rightSearchResultPane;
    private AlphaFineList searchResultList;
    private SearchListModel searchListModel;
@ -299,15 +298,10 @@ public class AlphaFineDialog extends UIDialog {
        leftSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT));
        rightSearchResultPane = new JPanel();
        rightSearchResultPane.setBackground(Color.WHITE);
-        UILabel splitLine = new UILabel();
-        splitLine.setBackground(AlphaFineConstants.GRAY);
-        splitLine.setPreferredSize(new Dimension(1, AlphaFineConstants.CONTENT_HEIGHT));
        rightSearchResultPane.setPreferredSize(new Dimension(AlphaFineConstants.RIGHT_WIDTH - 1, AlphaFineConstants.CONTENT_HEIGHT));
        searchResultPane.add(leftSearchResultPane, BorderLayout.WEST);
-        searchResultPane.add(splitLine, BorderLayout.CENTER);
        searchResultPane.add(rightSearchResultPane, BorderLayout.EAST);
        UILabel splitLabel = new UILabel();
-        splitLabel.setBackground(AlphaFineConstants.GRAY);
        splitLabel.setPreferredSize(new Dimension(AlphaFineConstants.HEIGHT, 1));
        searchResultPane.add(splitLabel, BorderLayout.NORTH);
        add(searchResultPane, BorderLayout.SOUTH);
@ -344,6 +338,32 @@ public class AlphaFineDialog extends UIDialog {
     */
    private void fireStopLoading() {
        searchListModel.resetState();
+        replaceLeftPane();
+    }
+
+    /**
+     * 刷新容器
+     */
+    private void refreshContainer() {
+        validate();
+        repaint();
+        revalidate();
+    }
+
+    /**
+     * 重置结果面板
+     */
+    private void replaceLeftPane() {
+        if (searchListModel.getSize() == 0 && defaultPane == null) {
+            defaultPane = new NoResultPane(Inter.getLocText("FR-Designer-AlphaFine_NO_Result"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/no_result.png"));
+            searchResultPane.remove(leftSearchResultPane);
+            searchResultPane.add(defaultPane, BorderLayout.WEST);
+        } else if (searchListModel.getSize() > 0 && defaultPane != null) {
+            searchResultPane.remove(defaultPane);
+            defaultPane = null;
+            searchResultPane.add(leftSearchResultPane, BorderLayout.WEST);
+        }
+        refreshContainer();
    }

    /**
@ -534,7 +554,7 @@ public class AlphaFineDialog extends UIDialog {
                break;
            case ACTION:
                rightSearchResultPane.removeAll();
-                rightSearchResultPane.add(new ActionPreviewPane());
+                rightSearchResultPane.add(new NoResultPane(Inter.getLocText("FR-Designer_NoResult"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/noresult.png")));
                validate();
                repaint();
                break;
@ -625,7 +645,6 @@ public class AlphaFineDialog extends UIDialog {
     */
    private void initGlobalListener() {
        initAWTEventListener();
-        initMouseListener();
    }

    /**
@ -912,6 +931,8 @@ public class AlphaFineDialog extends UIDialog {
                        if (getSelectedIndex() == 1) {
                            searchTextField.requestFocus();
                        }
+                    } else if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+                        searchTextField.requestFocus();
                    }
                }
            });
--- a/designer/src/com/fr/design/mainframe/alphafine/images/no_result.png
+++ b/designer/src/com/fr/design/mainframe/alphafine/images/no_result.png
--- a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java
@ -1,37 +0,0 @@
-package com.fr.design.mainframe.alphafine.preview;
-
-
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.mainframe.alphafine.AlphaFineConstants;
-import com.fr.general.IOUtils;
-import com.fr.general.Inter;
-
-import javax.swing.*;
-import java.awt.*;
-
-
-/**
- * Created by XiaXiang on 2017/5/5.
- */
-public class ActionPreviewPane extends JPanel {
-    private static final Font NAME = new Font("Song_TypeFace", 0, 14);
-
-    public ActionPreviewPane() {
-        setLayout(new BorderLayout());
-        setBackground(null);
-        setBorder(BorderFactory.createEmptyBorder(135, 0, 0, 0));
-        UILabel image = new UILabel();
-        image.setPreferredSize(new Dimension(150, 111));
-        image.setHorizontalAlignment(SwingConstants.CENTER);
-        image.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
-        image.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/noresult.png"));
-        UILabel description = new UILabel(Inter.getLocText("FR-Designer_NoResult"));
-        description.setForeground(AlphaFineConstants.MEDIUM_GRAY);
-        description.setFont(NAME);
-        description.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
-        description.setHorizontalAlignment(SwingConstants.CENTER);
-        this.add(image, BorderLayout.CENTER);
-        this.add(description, BorderLayout.SOUTH);
-    }
-
-}
--- a/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/preview/NoResultPane.java
@ -0,0 +1,31 @@
+package com.fr.design.mainframe.alphafine.preview;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.mainframe.alphafine.AlphaFineConstants;
+import com.fr.general.FRFont;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Created by XiaXiang on 2017/8/14.
+ */
+public class NoResultPane extends JPanel {
+    public NoResultPane(String title, Icon icon) {
+        setLayout(new BorderLayout());
+        setBackground(Color.white);
+        setPreferredSize(new Dimension(AlphaFineConstants.LEFT_WIDTH, AlphaFineConstants.CONTENT_HEIGHT));
+        UILabel image = new UILabel();
+        image.setPreferredSize(new Dimension(150, 111));
+        image.setHorizontalAlignment(SwingConstants.CENTER);
+        image.setIcon(icon);
+        image.setBorder(BorderFactory.createEmptyBorder(100,0,0,0));
+        UILabel description = new UILabel(title);
+        description.setForeground(AlphaFineConstants.MEDIUM_GRAY);
+        description.setFont(FRFont.getInstance("SimSun", Font.PLAIN, 14));
+        description.setBorder(BorderFactory.createEmptyBorder(0, 0, 135, 0));
+        description.setHorizontalAlignment(SwingConstants.CENTER);
+        add(image, BorderLayout.CENTER);
+        add(description, BorderLayout.SOUTH);
+    }
+}
--- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java
@ -74,15 +74,13 @@ public class ActionSearchManager implements AlphaFineSearchProcessor {
                if (!AlphaFineHelper.getFilterResult().contains(object)) {
                    result.add(object);
                }
-
            }
-            if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) {
+            if (result.size() == 0) {
+                return lessModelList;
+            }
+            if (result.size() > 0 && result.size() < AlphaFineConstants.SHOW_SIZE + 1) {
                lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set")));
-                if (result.size() == 0) {
-                    lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL);
-                } else {
-                    lessModelList.addAll(result);
-                }
+                lessModelList.addAll(result);
            } else {
                lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.ACTION));
                lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE));
@ -97,4 +95,4 @@ public class ActionSearchManager implements AlphaFineSearchProcessor {
    public SearchResult getMoreSearchResult() {
        return moreModelList;
    }
-}
+}
--- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java
@ -76,13 +76,12 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor {
                            searchResult.add(cellModel);
                        }
                    }
-                    if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) {
+                    if (searchResult.size() == 0) {
+                        return lessModelList;
+                    }
+                    if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) {
                        lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP")));
-                        if (searchResult.size() == 0) {
-                            lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL);
-                        } else {
-                            lessModelList.addAll(searchResult);
-                        }
+                        lessModelList.addAll(searchResult);
                    } else {
                        lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.DOCUMENT));
                        lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE));
@ -114,4 +113,4 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor {
        return moreModelList;
    }

-}
+}
--- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java
@ -100,13 +100,12 @@ public class FileSearchManager implements AlphaFineSearchProcessor {
            }

        }
-        if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) {
+        if (result.size() == 0) {
+            return lessModelList;
+        }
+        if (result.size() > 0 && result.size() < AlphaFineConstants.SHOW_SIZE + 1) {
            lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates")));
-            if (result.size() == 0) {
-                lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL);
-            } else {
-                lessModelList.addAll(result);
-            }
+            lessModelList.addAll(result);
        } else {
            lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.FILE));
            lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE));
@ -248,4 +247,4 @@ public class FileSearchManager implements AlphaFineSearchProcessor {
    public void setContainFrm(boolean containFrm) {
        isContainFrm = containFrm;
    }
-}
+}
--- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java
@ -109,13 +109,12 @@ public class PluginSearchManager implements AlphaFineSearchProcessor {
                            searchResult.add(cellModel);
                        }
                    }
-                    if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) {
-                        lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon")));
-                        if (searchResult.size() == 0) {
-                            lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL);
-                        } else {
-                            lessModelList.addAll(searchResult);
-                        }
+                    if (searchResult.size() == 0) {
+                        return this.lessModelList;
+                    }
+                    if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) {
+                        lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates")));
+                        lessModelList.addAll(searchResult);
                    } else {
                        lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.PLUGIN));
                        lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE));
@ -142,4 +141,4 @@ public class PluginSearchManager implements AlphaFineSearchProcessor {
    public SearchResult getMoreSearchResult() {
        return this.moreModelList;
    }
-}
+}
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@ -2125,4 +2125,5 @@ FS-Designer_DS_Filter_Odd_Tip=Odd_Tip
 FS-Designer_DS_Filter_Even_Tip=Even_Tip
 FS-Designer_DS_Filter_Specify_Tip=Specify_Tip
 FR-Designer_Mobile-Height-Percent=Max Percent
-FR-Designer_Mobile-Height-Limit=Height Limit
+FR-Designer_Mobile-Height-Limit=Height Limit
+FR-Designer-AlphaFine_NO_Result=no search result
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@ -2121,4 +2121,5 @@ FR-Designer_Coords_And_Size=Coords & Size
 FR-Designer_Barcode_Size=Barcode_Size
 FS-Designer_DS_Filter_Odd_Tip=Odd_Tip
 FS-Designer_DS_Filter_Even_Tip=Even_Tip 
-FS-Designer_DS_Filter_Specify_Tip=Specify_Tip
+FS-Designer_DS_Filter_Specify_Tip=Specify_Tip
+FR-Designer-AlphaFine_NO_Result=no search result
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@ -2132,4 +2132,5 @@ FR-Designer_Coords_And_Size=\u5750\u6807\u00B7\u5C3A\u5BF8
 FR-Designer_Barcode_Size=\u6761\u5F62\u7801\u5927\u5C0F
 FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5947\u6570\u96C6(1,3,5...)
 FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5076\u6570\u96C6(2,4,6...)
-FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u4E3A1,2-3,5,8\uFF0C\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u5185\u503C\u53C2\u6570$_count_\u8868\u793A\u603B\u4E2A\u6570
+FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u4E3A1,2-3,5,8\uFF0C\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u5185\u503C\u53C2\u6570$_count_\u8868\u793A\u603B\u4E2A\u6570
+FR-Designer-AlphaFine_NO_Result=\u65E0\u641C\u7D22\u7ED3\u679C
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@ -2125,3 +2125,4 @@ FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\
 FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5076\u6578\u96C6(2,4,6...)
 FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u70BA1,2-3,5,8\uFF0C\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u5185\u7F6E\u53C3\u6578$_count_\u8868\u793A\u7E02\u500B\u6578
 M-New_FormBook=\u65B0\u589E\u6C7A\u7B56\u5831\u8868
+FR-Designer-AlphaFine_NO_Result=\u7121\u641C\u7D22\u7D50\u679C
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@ -379,10 +379,9 @@ public abstract class ToolBarMenuDock {
            //  shortCuts.add(new ForumAction());
        }
        shortCuts.add(SeparatorDef.DEFAULT);
-        shortCuts.add(new AboutAction());
-        shortCuts.add(SeparatorDef.DEFAULT);
        shortCuts.add(new AlphaFineAction());
-
+        shortCuts.add(SeparatorDef.DEFAULT);
+        shortCuts.add(new AboutAction());
        return shortCuts.toArray(new ShortCut[shortCuts.size()]);
    }