From 7b714fd69bb99ae9da968fc9603c044c1d01212a Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 14 Aug 2024 22:47:28 +0800 Subject: [PATCH] =?UTF-8?q?INO-21074=20=E6=96=B0=E5=BB=BA=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/ui/designer/EmptyLayoutPane.java | 2 +- .../com/fr/design/widget/ui/designer/NewFormPane.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/EmptyLayoutPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/EmptyLayoutPane.java index f17b258f90..706a4db67b 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/EmptyLayoutPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/EmptyLayoutPane.java @@ -20,7 +20,7 @@ public class EmptyLayoutPane extends PredefinedLayoutPane { BorderFactory.createEmptyBorder(39, 105, 0, 105), BorderFactory.createDashedBorder(Color.BLACK, 1.0f, 2.0f, 2.0f, true) )); - UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_New_Empty_Template")); + UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_New_Empty_Template"), UILabel.LEFT); label.setBorder(BorderFactory.createEmptyBorder(0, 78, 30, 0)); this.add(newFormIcon, BorderLayout.NORTH); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java index f5121bef1f..9410c40acc 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/NewFormPane.java @@ -1,5 +1,6 @@ package com.fr.design.widget.ui.designer; +import com.fr.base.i18n.BidiUtils; import com.fr.base.iofile.attr.TemplateLayoutIdAttrMark; import com.fr.design.DesignerEnvManager; import com.fr.design.border.UITitledMatteBorder; @@ -62,10 +63,11 @@ public class NewFormPane extends BasicPane { newFormModel = NewFormModel.getInstance(); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 0)); this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.add(createModuleListPane(), BorderLayout.WEST); + this.add(createModuleListPane(), BorderLayout.LINE_START); this.add(createTemplateManagePane(), BorderLayout.CENTER); initWindow(); DesignerCloudURLManager.getInstance().testConnect(); + BidiUtils.applyOrientationByLocale(this); } private void initWindow() { @@ -166,8 +168,8 @@ public class NewFormPane extends BasicPane { JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); jPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); jPanel.setPreferredSize(new Dimension(1, 129)); - jPanel.add(createNewTemplatePane(), BorderLayout.WEST); - jPanel.add(createSwitchButtonPane(), BorderLayout.EAST); + jPanel.add(createNewTemplatePane(), BorderLayout.LINE_START); + jPanel.add(createSwitchButtonPane(), BorderLayout.LINE_END); return jPanel; }