Merge pull request #4283 in DESIGN/design from final/10.0 to release/10.0

* commit '929ca3ef67b02087b69b0d155876a3bf595fa4ba':
  REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
  REPORT-52418   国际化适配

designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@@ -74,6 +74,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private String originalCharSet = null;
 
     private JPanel mainPanel;
+
     // Database pane
     public DatabaseConnectionPane() {
         this.initComponents();
@@ -122,7 +123,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                             driverTips.setText(Toolkit.i18nText("Fine_Designer_Not_Found_Driver"));
                             gridJpanel.add(driverTips);
                             UILabel deatail = new UILabel();
-                            String content = Toolkit.i18nText("Fine_Designer_Not_Found") + select.getResultException().getDetailMessage() + Toolkit.i18nText("Fine_Designer_Driver");
+                            String content = Toolkit.i18nText("Fine_Designer_Not_Found") + " " + select.getResultException().getDetailMessage() + " " + Toolkit.i18nText("Fine_Designer_Driver");
                             deatail.setText(content);
                             deatail.setToolTipText(content);
                             gridJpanel.add(deatail);
@@ -422,7 +423,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         private static JNDIDefPane jndiDefPane = new JNDIDefPane();
 
         @Override
-        protected JPanel  mainPanel() {
+        protected JPanel mainPanel() {
             return jndiDefPane;
         }
 

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -19,6 +19,7 @@ import com.fr.design.worker.WorkerManager;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.file.FILE;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.third.javax.annotation.Nonnull;
@@ -70,8 +71,8 @@ public class MutilTempalteTabPane extends JComponent {
     private static Icon CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
     private static Icon MOUSE_OVER_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png");
     private static Icon MOUSE_PRESS_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png");
-    private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(MutilTempalteTabPane.class.getResource("/com/fr/design/images/file/white_saving_close.gif"));
+    private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/white_saving_close.gif"));
-    private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(MutilTempalteTabPane.class.getResource("/com/fr/design/images/file/grey_saving_close.gif"));
+    private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/grey_saving_close.gif"));
     private static final String ELLIPSIS = "...";
     private static final int GAP = 5;
     private static final int SMALLGAP = 3;

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.general.IOUtils;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -16,7 +17,7 @@ import javax.swing.JPanel;
  */
 public class OpenLoadingPane extends JPanel {
 
-    private static final ImageIcon LOADING_ICON = new ImageIcon(OpenLoadingPane.class.getResource("/com/fr/design/images/mainframe/loading.gif"));
+    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/loading.gif"));
 
     private UILabel loadingLabel;