From 4c897370947ec0832b53b58b59a364ded8dcd351 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 26 Mar 2020 15:51:27 +0800
Subject: [PATCH 1/2] REPORT-27106 && REPORT-27144

---
 .../com/fr/design/DesignerEnvManager.java     | 20 +++++++++++++++++++
 .../java/com/fr/design/dialog/TipDialog.java  |  8 +++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
index 81211cc57..d94605d42 100644
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@@ -8,18 +8,21 @@ import com.fr.base.Utils;
 import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.dialog.ErrorDialog;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.locale.impl.ProductImproveMark;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.update.push.DesignerPushUpdateConfigManager;
 import com.fr.design.style.color.ColorSelectConfigManager;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.DesignerPort;
+import com.fr.exit.DesignerExiter;
 import com.fr.file.FILEFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogFormatter;
@@ -345,6 +348,23 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
         } catch (IOException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            ErrorDialog dialog = new ErrorDialog(null,
+                                                 Toolkit.i18nText("Fine-Design_Error_Start_Apology_Message"),
+                                                 Toolkit.i18nText("Fine-Design_Error_Start_Report"),
+                                                 e.getMessage()) {
+                @Override
+                protected void okEvent() {
+                    dispose();
+                    DesignerExiter.getInstance().execute();
+                }
+
+                @Override
+                protected void restartEvent() {
+                    dispose();
+                    RestartHelper.restart();
+                }
+            };
+            dialog.setVisible(true);
         } finally {
             if (null != fileWriter) {
                 try {
diff --git a/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java b/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java
index e4cf0c8e7..894f4e45b 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java
@@ -8,6 +8,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.IOUtils;
 
 import javax.swing.*;
+import javax.swing.text.BadLocationException;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -39,7 +40,12 @@ public abstract class TipDialog extends JDialog implements ActionListener {
         northPane.add(iconPane, BorderLayout.WEST);
         northPane.add(tipPane, BorderLayout.CENTER);
 
-        JTextArea area = new JTextArea(type);
+        JTextPane area = new JTextPane();
+        UILabel typeLabel = new UILabel(type);
+        area.insertComponent(typeLabel);
+        UILabel logoIconLabel = new UILabel();
+        logoIconLabel.setIcon(IOUtils.readIcon("com/fr/base/images/oem/logo.png"));
+        area.insertComponent(logoIconLabel);
         area.setPreferredSize(new Dimension(400, 100));
         area.setEnabled(true);
         area.setEditable(false);

From 91c9b0535d35dbdb087e44c7052e9b450659412f Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 26 Mar 2020 15:54:18 +0800
Subject: [PATCH 2/2] fix import

---
 designer-base/src/main/java/com/fr/design/dialog/TipDialog.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java b/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java
index 894f4e45b..cb2adb527 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/TipDialog.java
@@ -8,7 +8,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.IOUtils;
 
 import javax.swing.*;
-import javax.swing.text.BadLocationException;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;