From c99ba9da45a46d89afd9a08929b3b4222eedce58 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 1 Aug 2024 17:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88web=E5=B1=9E=E6=80=A7-js?= =?UTF-8?q?=E3=80=81css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/frpane/EditingStringListPane.java | 6 ++++-- .../src/main/java/com/fr/design/webattr/WebCssPane.java | 6 ++++-- .../src/main/java/com/fr/design/webattr/WebJsPane.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java index ebe6abb672..01a2eee9af 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java @@ -1,5 +1,6 @@ package com.fr.design.gui.frpane; +import com.fr.base.i18n.BidiUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.ibutton.UIButton; @@ -68,13 +69,13 @@ public abstract class EditingStringListPane extends BasicBeanPane> eastPane.add(removeButton); eastPane.add(moveUpButton); eastPane.add(moveDownButton); - this.add(GUICoreUtils.createBorderPane(eastPane, BorderLayout.NORTH), BorderLayout.EAST); + this.add(GUICoreUtils.createBorderPane(eastPane, BorderLayout.NORTH), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); JPanel centerPane = new JPanel(new BorderLayout(0, 5)); this.add(centerPane, BorderLayout.CENTER); JPanel northcenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); northcenterPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); - northcenterPane.add(addButton, BorderLayout.EAST); + northcenterPane.add(addButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); centerPane.add(northcenterPane, BorderLayout.NORTH); centerPane.add(new JScrollPane(jlist), BorderLayout.CENTER); @@ -82,6 +83,7 @@ public abstract class EditingStringListPane extends BasicBeanPane> this.addButton.setEnabled(false); this.checkEnableState(); + BidiUtils.applyOrientationByLocale(this); } private void addListener() { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java index 7dcd3e21b2..3cb889fff1 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java @@ -1,5 +1,6 @@ package com.fr.design.webattr; +import com.fr.base.i18n.BidiUtils; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.EditingStringListPane; import com.fr.design.gui.ibutton.UIButton; @@ -37,14 +38,14 @@ public class WebCssPane extends BasicPane { this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); JPanel outnorth = new JPanel(new BorderLayout(0, 5)); - JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT,8,0)); + JPanel northPane = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT,8,0)); localText = new UITextField(); localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field")); localText.setEditable(false); chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection")); chooseFile.setPreferredSize(new Dimension(75, 23)); chooseFile.addActionListener(chooseFileListener); - northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":"), FlowLayout.LEFT); + northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File"), ":")), FlowLayout.LEFT); northPane.add(localText, FlowLayout.CENTER); northPane.add(chooseFile, FlowLayout.RIGHT); outnorth.add(northPane,BorderLayout.NORTH); @@ -67,6 +68,7 @@ public class WebCssPane extends BasicPane { } }; this.add(centerPane, BorderLayout.CENTER); + BidiUtils.applyOrientationByLocale(this); } private ActionListener chooseFileListener = new ActionListener() { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java index 7b371802b6..e596deb68b 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java @@ -1,5 +1,6 @@ package com.fr.design.webattr; +import com.fr.base.i18n.BidiUtils; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.frpane.EditingStringListPane; @@ -55,8 +56,8 @@ public class WebJsPane extends BasicPane { this.setLayout(new BorderLayout(0, 20)); this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); - localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":", true); - urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location")+ ":", false); + localFileRadioButton = new UIRadioButton(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File"), ":"), true); + urlFileRadioButton = new UIRadioButton(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location"), ":"), false); ButtonGroup bg = new ButtonGroup(); bg.add(localFileRadioButton); bg.add(urlFileRadioButton); @@ -89,6 +90,7 @@ public class WebJsPane extends BasicPane { createNorthPane(); createEditingPane(); + BidiUtils.applyOrientationByLocale(this); } private void createNorthPane() {