diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java index 37bd82bfc5..dba9dcb92f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java @@ -5,6 +5,7 @@ package com.fr.design.gui.frpane; import com.fr.base.Parameter; import com.fr.base.core.KV; +import com.fr.base.i18n.BidiUtils; import com.fr.design.dialog.BasicPane; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; @@ -81,6 +82,7 @@ public class ReportletParameterViewPane extends BasicPane { } this.add(editorPane, BorderLayout.CENTER); + BidiUtils.applyOrientationByLocale(this); } diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java index 42f13ceed5..4e3b90dfbb 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java @@ -1,6 +1,7 @@ package com.fr.design.hyperlink; import com.fr.base.Utils; +import com.fr.base.i18n.BidiUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; @@ -74,8 +75,8 @@ public abstract class AbstractHyperNorthPane extends BasicB newWindowConfPane.add(widthTextFiled); JPanel centerPanel = new JPanel(new BorderLayout()); - centerPanel.add(targetFramePanel, BorderLayout.WEST); - centerPanel.add(newWindowConfPane, BorderLayout.EAST); + centerPanel.add(targetFramePanel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); + centerPanel.add(newWindowConfPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); newWindowConfPane.setVisible(false); centerPane.add(centerPanel); @@ -87,6 +88,7 @@ public abstract class AbstractHyperNorthPane extends BasicB }); this.add(this.setFootPanel(), BorderLayout.SOUTH); + BidiUtils.applyOrientationByLocale(this); } protected String[] getTargetFrames() { diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperNorthPane.java index 6bd55e7e9e..c8829b2637 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperNorthPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperNorthPane.java @@ -1,5 +1,6 @@ package com.fr.design.hyperlink; +import com.fr.base.i18n.BidiUtils; import com.fr.config.ServerPreferenceConfig; import com.fr.design.constants.LayoutConstants; @@ -50,7 +51,7 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane { urlTextField = new UITextField(headerPane.getWidth()); urlTextField.setText(ProductConstants.WEBSITE_URL); - JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlTextField, "URL:"); + JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlTextField, BidiUtils.reverseConcatenateStrings("URL", ":")); if (this.needRenamePane) { headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL)); diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java index 2975e7c343..18f074d1e2 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java @@ -1,6 +1,7 @@ package com.fr.design.hyperlink; import com.fr.base.Parameter; +import com.fr.base.i18n.BidiUtils; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.itableeditorpane.ParameterTableModel; @@ -45,7 +46,7 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane { parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameters"), null)); extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters")); - this.add(GUICoreUtils.createFlowPane(new Component[]{extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH); + this.add(GUICoreUtils.createFlowPane(new Component[]{extendParametersCheckBox}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT), BorderLayout.SOUTH); } @Override diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java index 91661301f1..3c7e23a757 100644 --- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java @@ -6,6 +6,7 @@ package com.fr.design.utils.gui; import com.fr.base.BaseUtils; import com.fr.base.Style; import com.fr.base.background.ColorBackground; +import com.fr.base.i18n.BidiUtils; import com.fr.data.util.function.AverageFunction; import com.fr.data.util.function.CountFunction; import com.fr.data.util.function.DataFunction; @@ -544,7 +545,7 @@ public final class GUICoreUtils { JPanel mainPane = new JPanel(); mainPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - mainPane.add(new UILabel(name), BorderLayout.WEST); + mainPane.add(new UILabel(name), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST); mainPane.add(comp, BorderLayout.CENTER); return mainPane;