diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java index 6b6d887ef7..5a2f3f543d 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java @@ -23,6 +23,7 @@ import com.fr.design.data.datapane.preview.desensitization.view.PreviewTableDese import com.fr.design.data.datapane.preview.desensitization.view.setting.TableDataDesensitizationSettingPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; +import com.fr.design.dialog.CollapsibleDetailDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.file.HistoryTemplateListCache; @@ -579,8 +580,9 @@ public class PreviewTablePane extends BasicPane { } catch (Exception e) { if (!(e instanceof CancellationException)) { FineLoggerFactory.getLogger().error(e.getMessage(), e); - FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), - Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon")); + CollapsibleDetailDialog detailDialog = new CollapsibleDetailDialog(DesignerContext.getDesignerFrame(), + new UILabel(Toolkit.i18nText("Fine-Design_Dataset_Query_Fail-Tip")), e.getMessage()); + detailDialog.setVisible(true); } dialog.setVisible(false); } finally { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java index 469540c817..d159930628 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java @@ -165,7 +165,6 @@ public class UICorrelationPane extends JPanel implements UIObserver { protected void initComponents() { tablePane = initUITable(); - tablePane.setShowVerticalLines(false); initAddButton(); } diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function.svg new file mode 100644 index 0000000000..b61bc599d4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function_disable.svg new file mode 100644 index 0000000000..318d4e7f31 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function_white.svg new file mode 100644 index 0000000000..0bbe063795 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_function_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin.svg new file mode 100644 index 0000000000..053982a29c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin_disable.svg new file mode 100644 index 0000000000..0b219f6459 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin_white.svg new file mode 100644 index 0000000000..10b5e02ac7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_plugin_white.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template.svg new file mode 100644 index 0000000000..a5b003ac82 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template_disable.svg new file mode 100644 index 0000000000..1ba486b6e8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template_white.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template_white.svg new file mode 100644 index 0000000000..0390cf3bef --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/alphaFine_template_white.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/alphafine/internet_error.svg b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/internet_error.svg new file mode 100644 index 0000000000..23175ecf2e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/alphafine/internet_error.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json index 81d2177697..fde584207a 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json @@ -487,6 +487,29 @@ "bulb_hover": "alphafine/bulb_hover.svg", "minimize": "alphafine/minimize.svg", "search_hint": "alphafine/search_hint.svg", - "no_result": "alphafine/no_result.svg" + "no_result": "alphafine/no_result.svg", + "internet_error": "alphafine/internet_error.svg", + "alphafine1": { + "normal": "alphafine/alphaFine_function.svg", + "disable": "alphafine/alphaFine_function_disable.svg", + "white": "alphafine/alphaFine_function_white.svg" + }, + "alphafine2": "toolbar/help.svg", + "alphafine3": { + "normal": "alphafine/alphaFine_template.svg", + "disable": "alphafine/alphaFine_template_disable.svg", + "white": "alphafine/alphaFine_template_white.svg" + }, + "alphafine4": { + "normal": "alphafine/alphaFine_plugin.svg", + "disable": "alphafine/alphaFine_plugin_disable.svg", + "white": "alphafine/alphaFine_plugin_white.svg" + }, + "alphafine8": "toolbar/help.svg", + "alphafine10": { + "normal": "alphafine/alphaFine_template.svg", + "disable": "alphafine/alphaFine_template_disable.svg", + "white": "alphafine/alphaFine_template_white.svg" + } } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchResultContentCellRender.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchResultContentCellRender.java index 3d7016aa85..6922e9e8f0 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchResultContentCellRender.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchResultContentCellRender.java @@ -1,12 +1,13 @@ package com.fr.design.mainframe.alphafine.component; +import com.fine.theme.icon.LazyIcon; import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.actions.help.alphafine.AlphaFineConstants; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.alphafine.AlphaFineUtil; import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel; -import com.fr.general.IOUtils; import com.fr.stable.StringUtils; import javax.swing.JList; @@ -25,9 +26,7 @@ import java.awt.Dimension; public class SearchResultContentCellRender implements ListCellRenderer { private static final int OFFSET = FineUIScale.scale(45); - private static final String SELECTED_PATH = AlphaFineConstants.IMAGE_URL + "selected"; - private static final String CELL_PATH = AlphaFineConstants.IMAGE_URL + "alphafine"; - private static final String SUFFIX = ".png"; + private static final String ICON_ID_PREFIX = "alphafine"; private String[] segmentationResult; @@ -43,19 +42,16 @@ public class SearchResultContentCellRender implements ListCellRenderer { AlphaCellModel model = (AlphaCellModel) value; JPanel panel = new JPanel(new BorderLayout()); panel.setBackground(Color.WHITE); - panel.setBorder(new ScaledEmptyBorder(0,10,0,0)); + panel.setBorder(new ScaledEmptyBorder(0,0,0,0)); // 图标icon 样式 UILabel iconLabel = new UILabel(); if (isSelected) { - iconLabel.setText(StringUtils.BLANK + model.getName()); - String iconUrl = SELECTED_PATH + model.getType().getTypeValue() + SUFFIX; - panel.setBackground(AlphaFineConstants.BLUE); - iconLabel.setForeground(Color.WHITE); - iconLabel.setIcon(IOUtils.readIcon(iconUrl)); + iconLabel.setText(model.getName()); + panel.setBackground(FineUIUtils.getUIColor("defaultHighlightBorderColor", "Component.focusedBorderColor")); + iconLabel.setIcon(new LazyIcon(ICON_ID_PREFIX + model.getType().getTypeValue()).white()); } else { iconLabel.setText(AlphaFineUtil.highLightModelName(model.getName(), segmentationResult)); - String iconUrl = CELL_PATH + model.getType().getTypeValue() + SUFFIX; - iconLabel.setIcon(IOUtils.readIcon(iconUrl)); + iconLabel.setIcon(new LazyIcon(ICON_ID_PREFIX + model.getType().getTypeValue())); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchResultPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchResultPane.java index a94abd33a1..e404d3f169 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchResultPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchResultPane.java @@ -3,10 +3,12 @@ package com.fr.design.mainframe.alphafine.component; import com.formdev.flatlaf.ui.FlatUIUtils; import com.fr.design.actions.help.alphafine.AlphaFineConstants; import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.iscrollbar.UIScrollBar; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.design.mainframe.alphafine.preview.ResultShowPane; import javax.swing.JPanel; +import javax.swing.JSeparator; import java.awt.BorderLayout; import java.awt.Color; @@ -31,14 +33,23 @@ public class SearchResultPane extends JPanel { searchResultList = new AlphaFineList(); searchResultList.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); searchResultList.setFixedCellHeight(AlphaFineConstants.CELL_HEIGHT); - leftSearchResultPane = new UIScrollPane(searchResultList); + leftSearchResultPane = new UIScrollPane(searchResultList) { + @Override + public UIScrollBar createVerticalScrollBar() { + UIScrollBar verticalScrollBar = super.createVerticalScrollBar(); + verticalScrollBar.setOpaque(false); + return verticalScrollBar; + } + }; searchListModel = new SearchListModel(new SearchResult(), searchResultList, leftSearchResultPane); searchResultList.setModel(searchListModel); searchResultList.setCellRenderer(new SearchResultContentCellRender(segmentationResult)); searchResultList.setResultShowPane(rightSearchResultPane); this.setLayout(new BorderLayout()); - this.add(row(cell(leftSearchResultPane).weight(1), cell(rightSearchResultPane).weight(1)).getComponent()); + JSeparator sep = new JSeparator(); + sep.setOrientation(JSeparator.VERTICAL); + this.add(row(cell(leftSearchResultPane).weight(1), row(cell(sep),cell(rightSearchResultPane)).weight(1)).getComponent()); this.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE)); this.setPreferredSize(AlphaFineConstants.PREVIEW_SIZE); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/TemplateResourceImagePanel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/TemplateResourceImagePanel.java index 9697bfc2c6..1e6b09d066 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/TemplateResourceImagePanel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/TemplateResourceImagePanel.java @@ -1,9 +1,10 @@ package com.fr.design.mainframe.alphafine.component; +import com.fine.theme.utils.FineUIScale; +import com.fine.theme.utils.FineUIUtils; import com.fr.base.GraphHelper; import com.fr.design.mainframe.alphafine.model.TemplateResource; import com.fr.design.utils.DesignUtils; -import com.fr.general.FRFont; import com.fr.third.jodd.util.StringUtil; import javax.swing.JPanel; @@ -19,9 +20,11 @@ import java.awt.RenderingHints; public class TemplateResourceImagePanel extends JPanel { - private static final int BACKGROUND_HEIGHT = 20; + private static final int BACKGROUND_HEIGHT = FineUIScale.scale(20); - private static final Color BACKGROUND_COLOR = new Color(0x419BF9); + private static final int HEIGHT_OFFSET = FineUIScale.scale(5); + + private static final Color BACKGROUND_COLOR = FineUIUtils.getUIColor("defaultHighlightBorderColor", "Component.focusedBorderColor"); private static final Font TAG_FONT = DesignUtils.getDefaultGUIFont().applySize(12); @@ -29,8 +32,8 @@ public class TemplateResourceImagePanel extends JPanel { private TemplateResource templateResource; - private int width = 200; - private int height = 100; + private int width = FineUIScale.scale(200); + private int height = FineUIScale.scale(100); public TemplateResourceImagePanel(TemplateResource templateResource) { this.templateResource = templateResource; @@ -68,7 +71,7 @@ public class TemplateResourceImagePanel extends JPanel { g2.setColor(Color.WHITE); int x = (getWidth() - GraphHelper.getWidth(tagName, g2.getFont())) / 2; g2.setFont(TAG_FONT); - g2.drawString(tagName, x, getHeight() - 5); + g2.drawString(tagName, x, getHeight() - HEIGHT_OFFSET); } g2.setColor(defaultColor); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/NetWorkFailedPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/NetWorkFailedPane.java index 1dda65942c..c37c4152d1 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/NetWorkFailedPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/NetWorkFailedPane.java @@ -1,21 +1,25 @@ package com.fr.design.mainframe.alphafine.preview; +import com.fine.theme.icon.LazyIcon; +import com.fine.theme.utils.FineUIStyle; +import com.fine.theme.utils.FineUIUtils; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.actions.help.alphafine.AlphaFineConstants; import com.fr.design.mainframe.share.ui.base.MouseClickListener; -import com.fr.general.IOUtils; -import javax.swing.BorderFactory; import javax.swing.JPanel; -import javax.swing.SwingConstants; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Cursor; -import java.awt.FlowLayout; import java.awt.event.MouseEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.swing.ui.layout.Layouts.flex; +import static com.fine.swing.ui.layout.Layouts.fix; + /** * @author hades * @version 11.0 @@ -38,17 +42,10 @@ public class NetWorkFailedPane extends JPanel { } private JPanel createInternetErrorPane() { - JPanel panel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5); + JPanel panel = new JPanel(new BorderLayout()); panel.setBackground(Color.WHITE); - UILabel imagePanel = new UILabel(IOUtils.readIcon("/com/fr/base/images/share/internet_error.png")); - imagePanel.setBorder(BorderFactory.createEmptyBorder(50, 280, 0, 0)); - panel.add(imagePanel); - UILabel uiLabel = tipLabel(Toolkit.i18nText("Fine-Design_Share_Internet_Connect_Failed")); - uiLabel.setBorder(BorderFactory.createEmptyBorder(0, 300, 0, 0)); - uiLabel.setForeground(Color.decode("#8F8F92")); - UILabel reloadLabel = tipLabel(Toolkit.i18nText("Fine-Design_Share_Online_Reload")); - reloadLabel.setBorder(BorderFactory.createEmptyBorder(0, 310, 0, 0)); - reloadLabel.setForeground(Color.decode("#419BF9")); + UILabel reloadLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Online_Reload")); + reloadLabel.setForeground(FineUIUtils.getUIColor("defaultHighlightBorderColor", "Component.focusedBorderColor")); reloadLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); reloadLabel.addMouseListener(new MouseClickListener() { @Override @@ -56,14 +53,15 @@ public class NetWorkFailedPane extends JPanel { reload.run(); } }); - panel.add(uiLabel); - panel.add(reloadLabel); + panel.add(column( + flex(), + row(flex(), cell(new UILabel(new LazyIcon("internet_error", 110))), flex()), + fix(4), + row(flex(), cell(new UILabel(Toolkit.i18nText("Fine-Design_Share_Internet_Connect_Failed"), FineUIStyle.LABEL_DISABLED)), flex()), + fix(10), + row(flex(), cell(reloadLabel), flex()), + flex() + ).getComponent()); return panel; } - - private UILabel tipLabel(String text) { - UILabel tipLabel = new UILabel(text); - tipLabel.setHorizontalAlignment(SwingConstants.CENTER); - return tipLabel; - } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java index a4b47dd8ee..54b1ef0259 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java @@ -1,6 +1,9 @@ package com.fr.design.mainframe.alphafine.preview; +import com.fine.theme.utils.FineUIUtils; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.actions.help.alphafine.AlphaFineConstants; +import com.fr.design.constants.LayoutConstants; import com.fr.design.constants.UIConstants; import com.fr.design.dialog.link.MessageWithLink; import com.fr.design.gui.icontainer.UIScrollPane; @@ -13,7 +16,6 @@ import com.fr.design.utils.DesignUtils; import com.fr.design.utils.LinkStrUtils; import com.fr.stable.StringUtils; -import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; @@ -28,6 +30,11 @@ import java.awt.RenderingHints; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.swing.ui.layout.Layouts.row; +import static com.fine.swing.ui.layout.Layouts.column; +import static com.fine.theme.utils.FineUIScale.scale; + public class TemplateResourceDetailPane extends JPanel { @@ -40,17 +47,18 @@ public class TemplateResourceDetailPane extends JPanel { private UIScrollPane detailInfoPane; - private static final int IMAGE_HEIGHT = 170; - private static final int IMAGE_WIDTH = 310; - private static final int SCROLL_PANE_WIDTH = 315; - private static final int SCROLL_PANE_HEIGHT = 135; - private static final int CONTENT_PANE_WIDTH = 320; - private static final int CONTENT_PANE_HEIGHT = 180; - private static final int DETAIL_PANE_HEIGHT = 95; - private static final int TEXT_SCROLL_PANE_HEIGHT = 500; - private static final int PANE_WIDTH = 635; - private static final int BUTTON_WIDTH = 68; - private static final int BUTTON_HEIGHT = 20; + private static final int IMAGE_HEIGHT = scale(170); + private static final int IMAGE_WIDTH = scale(310); + private static final int SCROLL_PANE_WIDTH = scale(315); + private static final int SCROLL_PANE_HEIGHT = scale(135); + private static final int CONTENT_PANE_WIDTH = scale(320); + private static final int CONTENT_PANE_HEIGHT = scale(180); + private static final int DETAIL_PANE_HEIGHT = scale(95); + private static final int TEXT_SCROLL_PANE_HEIGHT = scale(95); + private static final int PANE_WIDTH = scale(635); + private static final int BUTTON_WIDTH = scale(68); + private static final int BUTTON_HEIGHT = scale(20); + private static final int BUTTON_OFFSET = scale(4); private static final String GOTO_DETAIL = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_GOTO_DETAIL"); private static final String START_USE = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_START_USE"); @@ -66,7 +74,7 @@ public class TemplateResourceDetailPane extends JPanel { private static final Color INFO_PANE_BACKGROUND = new Color(0xf9f9f9); private static final Color INFO_PANE_FOREGROUND = new Color(0x5b5b5c); - private static final Color MORE_INFO_LINK = new Color(0x419bf9); + private static final Color MORE_INFO_LINK = FineUIUtils.getUIColor("defaultHighlightBorderColor", "Component.focusedBorderColor"); private static final Font HTML_FONT = DesignUtils.getDefaultGUIFont().applySize(12); private static final Color HTML_COLOR = new Color(0x5c5c5d); @@ -79,11 +87,11 @@ public class TemplateResourceDetailPane extends JPanel { public TemplateResourceDetailPane(TemplateResourceDetail detail) { this.data = detail; initComponent(); - this.setLayout(new FlowLayout(FlowLayout.LEFT)); - this.setBorder(BorderFactory.createEmptyBorder(10, 20, 0, 20)); - this.add(imagePane); - this.add(contentPane); - this.add(detailInfoPane); + this.setBorder(new ScaledEmptyBorder(0, 0, 0, 0)); + this.add(column(LayoutConstants.VGAP_HUGER, + row(LayoutConstants.HORIZONTAL_GAP, cell(imagePane), cell(contentPane)), + cell(detailInfoPane) + ).getComponent()); this.setBackground(Color.WHITE); SwingUtilities.invokeLater(()->{scrollToTop();}); } @@ -120,7 +128,7 @@ public class TemplateResourceDetailPane extends JPanel { operatePane = new JPanel(new FlowLayout(FlowLayout.LEFT)); JLabel emptyLabel = new JLabel(); - emptyLabel.setPreferredSize(new Dimension(145, 25)); + emptyLabel.setPreferredSize(scale(new Dimension(145, 25))); JLabel priceLabel = new JLabel(); priceLabel.setForeground(Color.RED); if (data.getPrice() == 0) { @@ -172,11 +180,11 @@ public class TemplateResourceDetailPane extends JPanel { Graphics2D g2d = (Graphics2D) g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setColor(UIConstants.FLESH_BLUE); - g2d.fillRoundRect(0, 0, getWidth(), getHeight(), 4, 4); + g2d.fillRoundRect(0, 0, getWidth(), getHeight(), BUTTON_OFFSET, BUTTON_OFFSET); super.paintComponent(g2d); } }; - starUseButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + starUseButton.setBorder(new ScaledEmptyBorder(0, 0, 0, 0)); starUseButton.setForeground(Color.WHITE); starUseButton.setFont(AlphaFineConstants.MEDIUM_FONT); starUseButton.addActionListener(new StartUseAction(data)); @@ -214,7 +222,7 @@ public class TemplateResourceDetailPane extends JPanel { infoScrollPane = new UIScrollPane(content); infoScrollPane.setForeground(INFO_PANE_FOREGROUND); infoScrollPane.setPreferredSize(new Dimension(SCROLL_PANE_WIDTH, SCROLL_PANE_HEIGHT)); - infoScrollPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + infoScrollPane.setBorder(new ScaledEmptyBorder(0, 0, 0, 0)); } /** @@ -225,7 +233,7 @@ public class TemplateResourceDetailPane extends JPanel { detailInfoPane = new UIScrollPane(content); detailInfoPane.setPreferredSize(new Dimension(PANE_WIDTH, DETAIL_PANE_HEIGHT)); detailInfoPane.setBackground(Color.WHITE); - detailInfoPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + detailInfoPane.setBorder(new ScaledEmptyBorder(0, 0, 0, 0)); }