服务器配置-分页预览设置

designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.javascript;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.beans.FurtherBasicBeanPane;
@@ -79,12 +80,12 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
         styleBox = new UIComboBox(style.toArray());
         namePane.add(styleBox);
         namePane = GUICoreUtils.createFlowPane(new Component[]{
-                        new UILabel("  " + Toolkit.i18nText("Fine-Design_Report_Event_Name") + ":"),
+                        new UILabel(BidiUtils.reverseConcatenateStrings("  ", Toolkit.i18nText("Fine-Design_Report_Event_Name"), ":")),
                         nameText,
-                        new UILabel("    " + Toolkit.i18nText("Fine-Design_Report_Event_Type") + ":"),
+                        new UILabel(BidiUtils.reverseConcatenateStrings("    ", Toolkit.i18nText("Fine-Design_Report_Event_Type"), ":")),
                         styleBox},
-                FlowLayout.LEFT);
-        namePane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Event_Name_Type")));
+                BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT);
+        namePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Event_Name_Type"))));
         this.add(namePane, BorderLayout.NORTH);
         card = new CardLayout();
         hyperlinkPane = FRGUIPaneFactory.createCardLayout_S_Pane();
@@ -120,7 +121,7 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
         }
         //其他事件
         addOtherEvent();
-        hyperlinkPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_JavaScript_Set")));
+        hyperlinkPane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_JavaScript_Set"))));
         this.add(hyperlinkPane);
         styleBox.addItemListener(new ItemListener() {
             @Override
@@ -132,6 +133,7 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
                 card.show(hyperlinkPane, selected.toString());
             }
         });
+        BidiUtils.applyOrientationByLocale(this);
     }
 
     private void addOtherEvent() {

designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.webattr;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -73,20 +74,20 @@ public class DragToolBarPane extends WidgetToolBarPane {
 		southToolBar.setBackground(Color.lightGray);
 		JPanel northContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		SettingToolBar top = new SettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ToolBar_Top"), northToolBar);
-		northContentPane.add(top, BorderLayout.EAST);
+		northContentPane.add(top, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
 		northContentPane.add(northToolBar, BorderLayout.CENTER);
 		northContentPane.setBackground(Color.lightGray);
 
 		JPanel southContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		SettingToolBar bottom = new SettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ToolBar_Bottom"), southToolBar);
-		southContentPane.add(bottom, BorderLayout.EAST);
+		southContentPane.add(bottom, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
 		southContentPane.add(southToolBar, BorderLayout.CENTER);
 		southContentPane.setBackground(Color.lightGray);
 		JPanel movePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		movePane.add(northContentPane, BorderLayout.NORTH);
 		movePane.add(toolbarButtonList, BorderLayout.CENTER);
 		movePane.add(southContentPane, BorderLayout.SOUTH);
-
+		BidiUtils.setOrientationByLocale(toolbarButtonList);
 		// SplitPane
 		this.add(new JScrollPane(movePane), BorderLayout.CENTER);
 

designer-realize/src/main/java/com/fr/design/webattr/EditReportServerParameterPane.java

@@ -4,6 +4,7 @@
 package com.fr.design.webattr;
 
 import com.fr.base.ConfigManager;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.base.print.PrintSettingsAttrMark;
 import com.fr.config.PrintConfig;
 import com.fr.config.ServerPreferenceConfig;
@@ -68,6 +69,7 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
         if (WorkContext.getCurrent().isRoot()) {
             tabbedPane.addTab(Toolkit.i18nText("Fine-Designer_PC_Fit_Attr"), serverFitAttrPane = new ServerFitAttrPane());
         }
+        BidiUtils.applyOrientationByLocale(tabbedPane);
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.webattr;
 
 import com.fr.base.ConfigManager;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.config.Configuration;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -116,9 +117,9 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
 		double[] columnSize = {p, p, p, p};
 		double[] rowSize = {p, p, p, p, p};
 		Component[][] components = new Component[][]{
-				new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.RIGHT), buttonPane, null, null},
-				new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_PageSetup_Page") + ":", UILabel.RIGHT), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox},
-				new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Paging_Settings") + ":", UILabel.RIGHT), isPageFixedRowBox, linesPerPagePane, null},
+				new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), BidiUtils.rtl() ? UILabel.LEFT : UILabel.RIGHT), buttonPane, null, null},
+				new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_PageSetup_Page"), ":"), BidiUtils.rtl() ? UILabel.LEFT : UILabel.RIGHT), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox},
+				new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Paging_Settings"), ":"), BidiUtils.rtl() ? UILabel.LEFT : UILabel.RIGHT), isPageFixedRowBox, linesPerPagePane, null},
 				new Component[]{null, tipLabel, null, null},
 				new Component[]{isUseToolBarCheckBox, editToolBarButtonPanel, null, null}
 		};