From 7a642fc6410b4c490118d19eaf35e02983182ed2 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 16:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=20alphafin?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/component/AlphaFineDialog.java | 6 +++- .../mainframe/alphafine/images/noresult.png | Bin 0 -> 6691 bytes .../alphafine/preview/ActionPreviewPane.java | 32 ++++++++++++++++-- .../com/fr/design/locale/designer.properties | 3 +- .../design/locale/designer_en_US.properties | 1 + .../design/locale/designer_zh_CN.properties | 1 + .../design/locale/designer_zh_TW.properties | 1 + 7 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 designer/src/com/fr/design/mainframe/alphafine/images/noresult.png diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index eac17200a..d8293f772 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -16,6 +16,7 @@ import com.fr.design.mainframe.alphafine.listener.ComponentHandler; import com.fr.design.mainframe.alphafine.listener.DocumentAdapter; import com.fr.design.mainframe.alphafine.model.SearchListModel; 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; @@ -539,7 +540,10 @@ public class AlphaFineDialog extends UIDialog { this.searchWorker.execute(); } else if (selectedValue instanceof ActionModel) { - showDefaultPreviewPane(); + rightSearchResultPane.removeAll(); + rightSearchResultPane.add(new ActionPreviewPane()); + validate(); + repaint(); } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/noresult.png b/designer/src/com/fr/design/mainframe/alphafine/images/noresult.png new file mode 100644 index 0000000000000000000000000000000000000000..388bb84ffa88282e41b0f5c692f1c4a279ca7eb6 GIT binary patch literal 6691 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 P>VpP@YATk?TZa7)#)JsY literal 0 HcmV?d00001 diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java index ec2d6ca38..f0f209901 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java @@ -1,8 +1,36 @@ package com.fr.design.mainframe.alphafine.preview; + +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.mainframe.alphafine.AlphaFineConstants; +import com.fr.design.mainframe.alphafine.AlphaFineHelper; +import com.fr.general.IOUtils; + +import javax.swing.*; +import java.awt.*; + + /** * Created by XiaXiang on 2017/5/5. */ -public class ActionPreviewPane { - //todo:还没确定要不要使用面板截图 +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(120,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 name = new UILabel("暂不支持显示"); + name.setForeground(AlphaFineConstants.MEDIUM_GRAY); + name.setFont(NAME); + name.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); + name.setHorizontalAlignment(SwingConstants.CENTER); + this.add(image, BorderLayout.CENTER); + this.add(name, BorderLayout.SOUTH); + } + } diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 1453ff2df..96aaff01c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2008,4 +2008,5 @@ FR-Designer_AlphaFine_ShowLess=show less FR-Designer_Alphafine=AlphaFine FR-Designer-Alphafine_No_Remind= FR-Designer_AlphaFine_NoResult=no results -FR-Designer_ConnectionFailed=connection failed \ No newline at end of file +FR-Designer_ConnectionFailed=connection failed +FR-Designer_NoResult=No results \ No newline at end of file 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 96d737429..8c8e4046a 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 @@ -2009,3 +2009,4 @@ FR-Designer_AlphaFine_NoResult=No results FR-Designer_ConnectionFailed=Connection failed FR-Designer_AlphaFine_EnableAlphaFine=Enable AlphaFine FR-Designer_AlphaFine_EnableInternet=Internet +FR-Designer_NoResult=No results 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 d63b22e16..f37ed736f 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 @@ -2005,3 +2005,4 @@ FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A FR-Designer_AlphaFine_NoResult=\u6682\u65E0\u76F8\u5173\u5185\u5BB9 FR-Designer_ConnectionFailed=\u94FE\u63A5\u5931\u8D25 +FR-Designer_NoResult=\u6682\u4E0D\u652F\u6301\u663E\u793A 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 9e59a18a0..01fb047ff 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 @@ -2003,3 +2003,4 @@ FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8 FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A FR-Designer_AlphaFine_NoResult=\u66AB\u7121\u76F8\u95DC\u5167\u5BB9 FR-Designer_ConnectionFailed=\u93C8\u63A5\u5931\u6557 +FR-Designer_NoResult=\u66AB\u4E0D\u652F\u6301\u986F\u793A