模板-页眉页脚

designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java

@@ -16,6 +16,7 @@ import com.fr.base.headerfooter.NumberOfPageHFElement;
 import com.fr.base.headerfooter.PageNumberHFElement;
 import com.fr.base.headerfooter.TextHFElement;
 import com.fr.base.headerfooter.TimeHFElement;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -23,6 +24,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.style.background.BackgroundPane;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -44,6 +46,7 @@ import javax.swing.JViewport;
 import javax.swing.Scrollable;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
@@ -97,7 +100,9 @@ public class HeaderFooterEditPane extends JPanel {
 
 		JPanel hfPreviewContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		centerPane.add(hfPreviewContentPane, BorderLayout.CENTER);
-		hfPreviewContentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"),null));
+		TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), null);
+		titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
+		hfPreviewContentPane.setBorder(titledBorder);
 
 		hfPreviewPane = new HFPreviewPane();
 		scrollPreviewPane = new JScrollPane(hfPreviewPane);
@@ -129,9 +134,9 @@ public class HeaderFooterEditPane extends JPanel {
 		centerHFContainer.setContentChangeListener(contentChangeListener);
 		rightHFContainer.setContentChangeListener(contentChangeListener);
 
-		controlContentPane.add(createContainerSection(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Left_Section") + ":", leftHFContainer));
+		controlContentPane.add(createContainerSection(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Left_Section"), ":"), leftHFContainer));
-		controlContentPane.add(createContainerSection(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Center_Section") + ":", centerHFContainer));
+		controlContentPane.add(createContainerSection(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Center_Section"), ":"), centerHFContainer));
-		controlContentPane.add(createContainerSection(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Right_Section") + ":", rightHFContainer));
+		controlContentPane.add(createContainerSection(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Right_Section"), ":"), rightHFContainer));
 
 		//set current HFContainer
 		setCurrentHFContainer(leftHFContainer);
@@ -198,7 +203,7 @@ public class HeaderFooterEditPane extends JPanel {
 		headerFooterPane.add(headFootUnitFieldPane);  
 		
 		toolbar.add(headerFooterPane);
-		return toolbar;
+		return BidiUtils.applyOrientationByLocale(toolbar);
 	}
 
 
@@ -222,7 +227,7 @@ public class HeaderFooterEditPane extends JPanel {
 		UILabel titleLabel = new UILabel(containerTitle);
 		sectionPane.add(titleLabel, BorderLayout.NORTH);
 
-		titleLabel.setHorizontalAlignment(SwingConstants.LEFT);
+		titleLabel.setHorizontalAlignment(BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT);
 
 		sectionPane.add(new JScrollPane(hfContainer), BorderLayout.CENTER);
 

designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java

@@ -6,6 +6,7 @@ package com.fr.design.headerfooter;
 import com.fr.base.BaseUtils;
 import com.fr.base.PaperSize;
 import com.fr.base.ScreenResolution;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
@@ -46,8 +47,7 @@ public abstract class HeaderFooterPane extends BasicPane {
 		this.setLayout(new BorderLayout(0, 4));
 		// Left pane
 		JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		this.add(leftPane, BorderLayout.WEST);
+		this.add(leftPane, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
-
 		DefaultListModel defaultListModel = new DefaultListModel();
 		reportHFYypeList = new JList(defaultListModel);
 		reportHFYypeList.setCellRenderer(reportPageTypeRenderer);
@@ -55,6 +55,7 @@ public abstract class HeaderFooterPane extends BasicPane {
 				.addListSelectionListener(reportHFTypeSelectionListener);
 		JScrollPane hfTypeListScrollPane = new JScrollPane(reportHFYypeList);
 		leftPane.add(hfTypeListScrollPane, BorderLayout.CENTER);
+		BidiUtils.applyOrientationByLocale(leftPane);
 
 		defaultListModel.addElement(new Integer(
 				ReportConstants.REPORTPAGE_DEFAULT));