From 1e07cc8ee24cf42da41ed3f1f015d88cc6a241b3 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 28 Jun 2021 15:05:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-54349=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/OpenLoadingPane.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java b/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java index 624f280a74..adc30b2bff 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.i18n.Toolkit; import com.fr.general.IOUtils; import java.awt.Color; import java.awt.Component; @@ -17,9 +18,13 @@ import javax.swing.JPanel; */ public class OpenLoadingPane extends JPanel { - private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/loading.gif")); + private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/openloading.png")); + private static final Color TIP_COLOR = new Color(108, 174, 235); + private static final int Y_GAP = 50; + private static final int X_GAP = 10; private UILabel loadingLabel; + private UILabel tipLabel; public OpenLoadingPane() { @@ -47,7 +52,12 @@ public class OpenLoadingPane extends JPanel { int loadingLabelHeight = loadingLabel.getPreferredSize().height; int loadingLabelX = (width - loadingLabelWidth) / 2; int loadingLabelY = (height - loadingLabelHeight) / 2; + int tipLabelWidth = tipLabel.getPreferredSize().width; + int tipLabelHeight = tipLabel.getPreferredSize().height; + int tipLabelX = (width - tipLabelWidth) / 2 + X_GAP; + int tipLabelY = loadingLabelY + loadingLabelHeight - Y_GAP; loadingLabel.setBounds(loadingLabelX, loadingLabelY, loadingLabelWidth, loadingLabelHeight); + tipLabel.setBounds(tipLabelX, tipLabelY, tipLabelWidth, tipLabelHeight); } @Override @@ -56,7 +66,10 @@ public class OpenLoadingPane extends JPanel { }); setBackground(Color.WHITE); loadingLabel = new UILabel(LOADING_ICON); + tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading")); + tipLabel.setForeground(TIP_COLOR); add(loadingLabel); + add(tipLabel); } } From 25098619e436695d680741b1b0a37442a4acc93b Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 28 Jun 2021 15:06:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-54349=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/images/mainframe/openloading.png | Bin 0 -> 5702 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/mainframe/openloading.png diff --git a/designer-base/src/main/resources/com/fr/design/images/mainframe/openloading.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/openloading.png new file mode 100644 index 0000000000000000000000000000000000000000..512333be9ad2d5f65eb25629e9dffe2ca2722c8a GIT binary patch literal 5702 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 JY6a`ie*t4bAG-hm literal 0 HcmV?d00001