Browse Source

改一下titleborder的设置方法

persist/11.0-arabic
obo 6 months ago
parent
commit
361d746324
  1. 17
      designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java
  2. 4
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
  3. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
  4. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
  5. 4
      designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java

17
designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java

@ -1,5 +1,6 @@
package com.fr.base.i18n;
import javax.swing.border.TitledBorder;
import java.awt.Component;
import java.awt.ComponentOrientation;
import java.awt.Container;
@ -15,7 +16,10 @@ import java.util.Locale;
public class BidiUtils {
//private static final Locale ar = new Locale("ar", "SA");
private static final Locale ar = Locale.CHINA;
private static final Locale ar = true ? new Locale("ar", "SA") : Locale.CHINA;
//private static final Locale ar = Locale.CHINA;
private BidiUtils() {
}
@ -34,6 +38,12 @@ public class BidiUtils {
return component;
}
public static void setOrientationByLocale(Component... components) {
for (Component component : components) {
component.setComponentOrientation(ComponentOrientation.getOrientation(ar));
}
}
public static void applyOrientationByLocale(Component... components) {
for (Component component : components) {
component.applyComponentOrientation(ComponentOrientation.getOrientation(ar));
@ -58,6 +68,11 @@ public class BidiUtils {
return result.toString();
}
public static <T extends TitledBorder> T applyTitledBorderJustification(T titledBorder) {
titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
return titledBorder;
}
/**
* 镜像BoxLayout布局组件
*/

4
designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@ -70,9 +70,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
importedJsPane.setPreferredSize(new Dimension(265, 150));
jsPane = createJSContentPane(defaultArgs);
TitledBorder titledBorder = BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Toolkit.i18nText("Fine-Design_Report_JavaScript"));
titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
jsPane.setBorder(titledBorder);
jsPane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Toolkit.i18nText("Fine-Design_Report_JavaScript"))));
parameterPane.setPreferredSize(new Dimension(265, 150));
JPanel topPane = new JPanel(new GridLayout(1,2));

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java

@ -50,9 +50,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
this.add(centerPane, BorderLayout.CENTER);
TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell"));
titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
centerPane.setBorder(titledBorder);
centerPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell"))));
colRowPane = new ColumnRowVerticalPane();
centerPane.add(colRowPane, BorderLayout.NORTH);

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java

@ -67,10 +67,8 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
BidiUtils.applyOrientationByLocale(pane);
Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);
Font font = null;
TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float"), 4, 2, font, new Color(1, 159, 222));
border.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
// 圆角不行
centerPane.setBorder(border);
centerPane.setBorder(BidiUtils.applyTitledBorderJustification(new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float"), 4, 2, font, new Color(1, 159, 222))));
centerPane.add(pane, BorderLayout.NORTH);
addPaneInCenter(centerPane);

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

@ -100,9 +100,7 @@ public class HeaderFooterEditPane extends JPanel {
JPanel hfPreviewContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.add(hfPreviewContentPane, BorderLayout.CENTER);
TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), null);
titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
hfPreviewContentPane.setBorder(titledBorder);
hfPreviewContentPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), null)));
hfPreviewPane = new HFPreviewPane();
scrollPreviewPane = new JScrollPane(hfPreviewPane);

Loading…
Cancel
Save