From 8c03f0965771bc373e26cd09c3afaa4a30a829ab Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Wed, 14 Aug 2024 23:07:11 +0800
Subject: [PATCH] =?UTF-8?q?INO-21074=20=E5=85=B3=E9=97=AD=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E4=BF=9D=E5=AD=98=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/file/SaveSomeTemplatePane.java  | 25 +++++++++++--------
 .../java/com/fr/design/gui/ilist/UIList.java  | 13 ++++++++--
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
index 1517309ef1..84947e19e4 100644
--- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
@@ -1,9 +1,9 @@
 package com.fr.design.file;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.event.StateChangeListener;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -15,14 +15,19 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.log.FineLoggerFactory;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
-import java.awt.event.*;
+import javax.swing.AbstractListModel;
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Window;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
 /**
@@ -73,8 +78,8 @@ public class SaveSomeTemplatePane extends BasicPane {
 
             });
         }
-        UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_The_Source_To_Save"));
-        this.add(tip, BorderLayout.NORTH);
+        UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_The_Source_To_Save"), UILabel.LEADING);
+        this.add(BidiUtils.setOrientationByLocale(tip), BorderLayout.NORTH);
         templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane);
         this.add(scrollPane, BorderLayout.CENTER);
@@ -144,7 +149,7 @@ public class SaveSomeTemplatePane extends BasicPane {
 
         templatesChoosePane.add(chooseAllCheckBox, BorderLayout.NORTH);
         templatesChoosePane.add(templatesList, BorderLayout.CENTER);
-
+        BidiUtils.applyOrientationByLocale(templatesChoosePane);
     }
 
     /**
@@ -263,7 +268,7 @@ public class SaveSomeTemplatePane extends BasicPane {
             super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             templateCheckBoxes[index] = (UICheckBox) value;
             templateCheckBoxes[index].setBackground(list.getBackground());
-            return templateCheckBoxes[index];
+            return BidiUtils.applyOrientationByLocale(templateCheckBoxes[index]);
         }
 
     }
diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/UIList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/UIList.java
index 6970ed6767..099aff33ef 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ilist/UIList.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ilist/UIList.java
@@ -6,8 +6,17 @@ import com.fr.design.gui.itooltip.UIToolTip;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JToolTip;
+import javax.swing.ListCellRenderer;
+import javax.swing.ListModel;
+import java.awt.Component;
+import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.util.Vector;