服务器配置-打印配置、错误模板

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

@@ -1,5 +1,6 @@
 package com.fr.design.webattr;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -32,12 +33,12 @@ public class ErrorTemplatePane extends BasicBeanPane<String> {
         reportletNamePane.add(this.templateField);
 
         Component[][] components = {
-        		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Path") + ":"), reportletNamePane},
+        		{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Path"), ":")), reportletNamePane},
 
-        		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Parameters") + ":"), null},
+        		{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Parameters"), ":")), null},
-        		{new UILabel("message" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))},
+        		{new UILabel(BidiUtils.reverseConcatenateStrings("message", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))},
-        		{new UILabel("charset" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))},
+        		{new UILabel(BidiUtils.reverseConcatenateStrings("charset", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))},
-        		{new UILabel("exception" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))}
+        		{new UILabel(BidiUtils.reverseConcatenateStrings("exception", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))}
         };
         JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         

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

@@ -1,5 +1,6 @@
 package com.fr.design.webattr.printsettings;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.base.print.NativePrintAttr;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -67,11 +68,11 @@ public class GlobalNativePrintSettingPane extends AbstractNativePrintSettingPane
         defaultDownloadUrlCheck = GUICoreUtils.createNoBorderCheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"));
         JPanel downloadUrlSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(defaultDownloadUrlCheck, getCustomUrlSettingPane(), true);
         downloadUrlSettingCheckPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
-        JPanel downloadTipPane = getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Software_Download_Url") + ": ");
+        JPanel downloadTipPane = getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Software_Download_Url"), ": "));
         downloadTipPane.setBorder(BorderFactory.createEmptyBorder(0, 0, -6, 0));
 
         // 打印软件端口号
-        UILabel printPortTip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Native_Print_Port") + ": ");
+        UILabel printPortTip = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Native_Print_Port"), ": "));
         JPanel printPortFiledPane = getPrintPortFieldPane();
 
         // TableLayout

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

@@ -60,7 +60,7 @@ public class NoClientPrintSettingPane extends JPanel {
         double[] rowSize = {p};
         double[] columnSize = {60, p};
         Component[][] components = {
-                {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin") + ":"), pageMarginCheckPane}
+                {getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin"), ":")), pageMarginCheckPane}
         };
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15);
 

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

@@ -9,6 +9,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 
 import javax.swing.BorderFactory;
+import javax.swing.Box;
 import javax.swing.ButtonGroup;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -49,9 +50,8 @@ public class PrintSettingPane extends BasicPane {
         noClientPrintRadioButton.setSelected(true);
         buttonGroup.add(noClientPrintRadioButton);
         buttonGroup.add(nativePrintRadioButton);
-        noClientPrintRadioButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 50));
         JPanel radioGroupPane = GUICoreUtils.createFlowPane(new Component[] {
-                noClientPrintRadioButton, nativePrintRadioButton}, FlowLayout.LEFT, 0, 0);
+                noClientPrintRadioButton, Box.createHorizontalStrut(50), nativePrintRadioButton}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0);
         north.add(radioGroupPane);
         BidiUtils.applyOrientationByLocale(noClientPrintRadioButton, nativePrintRadioButton);
         noClientPrintSettingPane = new NoClientPrintSettingPane();