From 3669c44197240c15f00ab9f36640010014f54224 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Thu, 11 May 2017 01:12:27 +0800 Subject: [PATCH] rt --- .../alphafine/AlphaFineConstants.java | 15 +++++++++++++++ .../cell/cellRender/ContentCellRender.java | 3 ++- .../cell/cellRender/TitleCellRender.java | 5 +++-- .../alphafine/component/AlphaFineDialog.java | 2 +- .../mainframe/alphafine/images/loading.gif | Bin 8781 -> 11366 bytes .../previewPane/DocumentPreviewPane.java | 4 ++-- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java b/designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java index 8842b2782..cacac8bec 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java +++ b/designer/src/com/fr/design/mainframe/alphafine/AlphaFineConstants.java @@ -45,6 +45,21 @@ public class AlphaFineConstants { public static final Color BLACK = new Color(0x222222); + public static final Font SMALL_FONT = new Font("Song_TypeFace",0,10); + + public static final Font MEDIUM_FONT = new Font("Song_TypeFace",0,12); + + public static final Font LARGE_FONT = new Font("Song_TypeFace",0,18); + + public static final Font GREATER_FONT = new Font("Song_TypeFace",0,20); + + + + + + + + public static final String PLUGIN_SEARCH_URL = SiteCenter.getInstance().acquireUrlByKind("plugin.searchAPI"); diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java index 6d45def26..cf3c16573 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe.alphafine.cell.cellRender; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.cell.cellModel.AlphaCellModel; import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; @@ -33,7 +34,7 @@ public class ContentCellRender implements ListCellRenderer { name.setText(model.getName()); String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getCellType() + ".png"; name.setIcon(new ImageIcon(getClass().getResource(iconUrl))); - name.setFont(new Font("Song_TypeFace",0,12)); + name.setFont(AlphaFineConstants.MEDIUM_FONT); name.setForeground(new Color(0x222222)); name.setVerticalTextPosition(SwingConstants.CENTER); name.setHorizontalTextPosition(SwingConstants.RIGHT); diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java index 5493f5cd0..1c0c3e159 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe.alphafine.cell.cellRender; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; import javax.swing.*; import java.awt.*; @@ -23,8 +24,8 @@ public class TitleCellRender implements ListCellRenderer { panel.setBackground(new Color(0xf9f9f9)); panel.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); name.setText(moreModel.getName()); - name.setFont(new Font("Song_TypeFace",0,10)); - more.setFont(new Font("Song_TypeFace",0,10)); + name.setFont(AlphaFineConstants.SMALL_FONT); + more.setFont(AlphaFineConstants.SMALL_FONT); more.setText(moreModel.getContent()); name.setForeground(new Color(0x666666)); more.setForeground(new Color(0x666666)); 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 771203aac..12d4ff74b 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -68,7 +68,7 @@ public class AlphaFineDialog extends UIDialog { private void initComponents() { searchTextField = new AlphaTextField("AlphaFine"); - searchTextField.setFont(new Font("Song_TypeFace",0,20)); + searchTextField.setFont(AlphaFineConstants.GREATER_FONT); searchTextField.setBackground(Color.white); searchTextField.setBorderPainted(false); JPanel topPane = new JPanel(new BorderLayout()); diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/loading.gif b/designer/src/com/fr/design/mainframe/alphafine/images/loading.gif index d7662606ef22b7564b725a30d2dd90edf2b38227..497dcbf962e118f985c9ae01c25b3ef7c85f9f43 100644 GIT binary patch literal 11366 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 Uz@;oD`C!S^OAY=%{=M=404tL`!vFvP literal 8781 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 diff --git a/designer/src/com/fr/design/mainframe/alphafine/previewPane/DocumentPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/previewPane/DocumentPreviewPane.java index 767594371..155ab8490 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/previewPane/DocumentPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/previewPane/DocumentPreviewPane.java @@ -24,8 +24,8 @@ public class DocumentPreviewPane extends JPanel { titleArea.setForeground(AlphaFineConstants.BLUE); contentArea.setForeground(AlphaFineConstants.BLACK); titleArea.setPreferredSize(new Dimension(360, 30)); - titleArea.setFont(new Font("Song_TypeFace",0,18)); - contentArea.setFont(new Font("Song_TypeFace",0,12)); + titleArea.setFont(AlphaFineConstants.LARGE_FONT); + contentArea.setFont(AlphaFineConstants.MEDIUM_FONT); add(titleArea, BorderLayout.NORTH); add(contentArea, BorderLayout.CENTER); }