Browse Source

属性面板镜像化,优化一些代码结构

persist/11.0-arabic
obo 4 months ago
parent
commit
c6645f2d33
  1. 33
      designer-base/src/main/java/com/fr/base/i18n/BidiUtils.java
  2. 2
      designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
  3. 5
      designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java
  4. 5
      designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
  5. 3
      designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java
  6. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java
  7. 2
      designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java
  8. 4
      designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxUI.java
  9. 1
      designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuEastAttrItem.java
  10. 1
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
  11. 11
      designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java
  12. 3
      designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java
  13. 13
      designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java
  14. 10
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  15. 14
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
  16. 2
      designer-base/src/main/java/com/fr/design/mainframe/WestRegionContainerPane.java
  17. 2
      designer-base/src/main/java/com/fr/design/menu/ToolBarDef.java
  18. 2
      designer-base/src/main/java/com/fr/design/present/DictPresentPane.java
  19. 1
      designer-base/src/main/java/com/fr/design/utils/LinkStrUtils.java
  20. 3
      designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
  21. 2
      designer-realize/src/main/java/com/fr/design/mainframe/ReportFloatPane.java
  22. 3
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
  23. 15
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
  24. 3
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java
  25. 2
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java
  26. 3
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
  27. 5
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java
  28. 2
      designer-realize/src/main/java/com/fr/design/present/BarCodePane.java
  29. 4
      designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java
  30. 1
      designer-realize/src/main/java/com/fr/design/widget/CellWidgetCardPane.java
  31. 3
      designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
  32. 3
      designer-realize/src/main/java/com/fr/design/widget/ui/BasicWidgetPropertySettingPane.java
  33. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxDefinePane.java
  34. 5
      designer-realize/src/main/java/com/fr/design/widget/ui/CustomWritableRepeatEditorPane.java
  35. 9
      designer-realize/src/main/java/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
  36. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/FieldEditorDefinePane.java
  37. 3
      designer-realize/src/main/java/com/fr/design/widget/ui/IframeEditorDefinePane.java
  38. 3
      designer-realize/src/main/java/com/fr/design/widget/ui/WaterMarkDictPane.java
  39. 3
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java
  40. 2
      designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

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

@ -1,9 +1,7 @@
package com.fr.base.i18n;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.ComponentOrientation;
import java.awt.Container;
import java.awt.FlowLayout;
import java.util.Locale;
/**
@ -25,37 +23,18 @@ public class BidiUtils {
return ComponentOrientation.getOrientation(ar);
}
public static void applyOrientationByLocale(Container component) {
public static <T extends Component> T applyOrientationByLocale(T component) {
component.applyComponentOrientation(ComponentOrientation.getOrientation(ar));
return component;
}
public static void applyOrientationByLocale(Container ...component) {
for (Container container : component) {
container.applyComponentOrientation(ComponentOrientation.getOrientation(ar));
public static void applyOrientationByLocale(Component... components) {
for (Component component : components) {
component.applyComponentOrientation(ComponentOrientation.getOrientation(ar));
}
}
public static boolean rtl() {
return ComponentOrientation.getOrientation(ar) == ComponentOrientation.RIGHT_TO_LEFT;
}
public static String getBorderLayoutWest() {
return BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST;
}
public static String getBorderLayoutEast() {
return BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST;
}
public static int getFlowLayoutLeft() {
return BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT;
}
public static int getFlowLayoutRight() {
return BidiUtils.rtl() ? FlowLayout.LEFT : FlowLayout.RIGHT;
}
public static int getStableConstantsRight() {
return BidiUtils.rtl() ? com.fr.stable.Constants.LEFT : com.fr.stable.Constants.RIGHT;
}
}

2
designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

@ -340,7 +340,7 @@ public abstract class UpdateAction extends ShortCut implements Action {
setPressedIcon4Button(menuItem);
setDisabledIcon4Button(menuItem);
this.putValue(UIMenuItem.class.getName(), menuItem);
return menuItem;
return BidiUtils.applyOrientationByLocale(menuItem);
}
/**

5
designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java

@ -1,5 +1,6 @@
package com.fr.design.data.datapane;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.data.datapane.preview.PreviewLabel;
import com.fr.design.data.datapane.preview.PreviewLabel.Previewable;
@ -41,8 +42,8 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean {
rs.add(tableNameComboBox, BorderLayout.CENTER);
rs.add(GUICoreUtils.createFlowPane(new Component[]{new RefreshLabel(this), previewLabel}, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST);
rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER));
UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"), UILabel.LEFT);
UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), UILabel.LEFT);
UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT);
UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT);
UILabel l3 = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), MAX_WIDTH, UILabel.LEFT);
if (labelSize > 0) {
Dimension pSize = new Dimension(labelSize, 20);

5
designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java

@ -1,5 +1,6 @@
package com.fr.design.gui.controlpane;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.controlpane.shortcutfactory.ShortCutFactory;
@ -175,8 +176,8 @@ public abstract class UIControlPane extends JControlPane {
toolBarPane.add(topToolBar, BorderLayout.NORTH);
JPanel leftTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
leftTopPane.add(toolBarPane, BorderLayout.EAST);
leftTopPane.add(addItemLabel, BorderLayout.CENTER);
leftTopPane.add(toolBarPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
leftTopPane.add(addItemLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.CENTER);
return leftTopPane;
}

3
designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java

@ -1,5 +1,6 @@
package com.fr.design.gui.frpane;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.beans.ErrorMsgTextFieldAdapter;
import com.fr.design.beans.UITextFieldAdapter;
@ -84,7 +85,7 @@ public class RegFieldPane extends RegPane {
UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"));
tipLabel.setPreferredSize(new Dimension(60, 20));
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, errorMsgTextFieldAdapter.getErrorMsgTextField()}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
this.add(panel);
this.add(BidiUtils.applyOrientationByLocale(panel));
}
private void initRegErrorMsgField() {

2
designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java

@ -1,5 +1,6 @@
package com.fr.design.gui.frpane;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.dialog.BasicPane;
@ -91,6 +92,7 @@ public class RegPane extends BasicPane {
centerPane.add(cardPane, BorderLayout.NORTH);
jPanel.add(centerPane, BorderLayout.CENTER);
this.add(jPanel, BorderLayout.NORTH);
BidiUtils.applyOrientationByLocale(this);
regComboBox.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e) {
RegExp regExp = (RegExp)regComboBox.getSelectedItem();

2
designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java

@ -1,5 +1,6 @@
package com.fr.design.gui.icombobox;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.event.GlobalNameListener;
import com.fr.design.event.GlobalNameObserver;
import com.fr.design.event.UIObserver;
@ -71,6 +72,7 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser
setRenderer(new UIComboBoxRenderer());
setEditor(new UIComboBoxEditor());
initListener();
BidiUtils.applyOrientationByLocale(this);
}
protected void initListener() {

4
designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxUI.java

@ -1,5 +1,6 @@
package com.fr.design.gui.icombobox;
import com.fr.base.i18n.BidiUtils;
import com.fr.common.inputevent.InputEventBaseOnOS;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.UIButton;
@ -96,7 +97,8 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
}
g2d.setColor(linecolor);
if (!comboBox.isPopupVisible()) {
g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
int width = BidiUtils.rtl() ? c.getWidth() : c.getWidth() - arrowButton.getWidth() + 3;
g2d.drawRoundRect(0, 0, width, c.getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
} else {
g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.ARC, UIConstants.ARC);
g2d.drawLine(0, c.getHeight() - 1, c.getWidth(), c.getHeight() - 1);

1
designer-base/src/main/java/com/fr/design/gui/imenu/UIMenuEastAttrItem.java

@ -1,5 +1,6 @@
package com.fr.design.gui.imenu;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.utils.gui.GUIPaintUtils;
import com.fr.stable.Constants;

1
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java

@ -1,5 +1,6 @@
package com.fr.design.gui.itableeditorpane;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicPane;

11
designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java

@ -1,13 +1,16 @@
package com.fr.design.gui.itree.refreshabletree;
import com.fr.base.i18n.BidiUtils;
import com.fr.data.impl.TreeAttr;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import groovy.swing.factory.LayoutFactory;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.JPanel;
import java.awt.FlowLayout;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
@ -32,7 +35,7 @@ public class TreeRootPane extends BasicPane {
public TreeRootPane() {
this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
JPanel checkTypePane = BidiUtils.rtl() ? FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not"));
checkTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@ -40,7 +43,7 @@ public class TreeRootPane extends BasicPane {
checkTypePane.add(checkTypeCheckBox);
this.add(checkTypePane);
JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
JPanel loadTypePane = BidiUtils.rtl() ? FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async"));
loadTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@ -48,14 +51,14 @@ public class TreeRootPane extends BasicPane {
loadTypePane.add(loadTypeCheckBox);
this.add(loadTypePane);
JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
JPanel leafSelectPane = BidiUtils.rtl() ? FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")));
layerTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
this.add(leafSelectPane);
JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
JPanel returnFullPathPane = BidiUtils.rtl() ? FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")));
returnFullPathCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

3
designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java

@ -4,6 +4,7 @@ import com.fr.base.CoreDecimalFormat;
import com.fr.base.GraphHelper;
import com.fr.base.Style;
import com.fr.base.TextFormat;
import com.fr.base.i18n.BidiUtils;
import com.fr.data.core.FormatField;
import com.fr.data.core.FormatField.FormatContents;
import com.fr.design.border.UIRoundedBorder;
@ -139,7 +140,7 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
protected void initLayout() {
JPanel labeledFormatTypeComboBoxPane = new JPanel(new BorderLayout(20, 0));
labeledFormatTypeComboBoxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format")), BorderLayout.WEST);
labeledFormatTypeComboBoxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format")), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
labeledFormatTypeComboBoxPane.add(typeComboBox, BorderLayout.CENTER);
JPanel labeledRoundingCheckboxPane = new JPanel(new BorderLayout(0, 0));

13
designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java

@ -82,7 +82,7 @@ public class CenterRegionContainerPane extends JPanel {
};
toolbarPane.setLayout(FRGUIPaneFactory.createBorderLayout());
eastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
eastPane.add(largeToolbar = getToolBarMenuDock().createLargeToolbar(), BidiUtils.getBorderLayoutEast());
eastPane.add(largeToolbar = getToolBarMenuDock().createLargeToolbar(), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
eastCenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
combineUpTooBar();
eastCenterPane.add(combineUp, BorderLayout.NORTH);
@ -109,12 +109,9 @@ public class CenterRegionContainerPane extends JPanel {
* 创建上工具栏
*/
private void combineUpTooBar() {
// combineUp = new UIToolbar(BidiUtils.getFlowLayoutLeft());
// combineUp.setBorder(new MatteBorder(new Insets(0, LEFT_ALIGN_GAP, 1, 0), UIConstants.LINE_COLOR));
// combineUp.setLayout(new FlowLayout(BidiUtils.getFlowLayoutLeft(), 5, 2));
combineUp = new UIToolbar(BidiUtils.getFlowLayoutLeft());
combineUp = new UIToolbar(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT);
combineUp.setBorder(new MatteBorder(new Insets(0, LEFT_ALIGN_GAP, 1, 0), UIConstants.LINE_COLOR));
combineUp.setLayout(new FlowLayout(BidiUtils.getFlowLayoutLeft(), 5, 2));
combineUp.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 5, 2));
setUpUpToolBar(null);
}
@ -279,8 +276,8 @@ public class CenterRegionContainerPane extends JPanel {
//移除新建模板按钮
templateTabPane.remove(newWorkBookPane);
} else {
eastPane.add(largeToolbar, BidiUtils.getBorderLayoutWest());
templateTabPane.add(newWorkBookPane, BidiUtils.getBorderLayoutWest());
eastPane.add(largeToolbar, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
templateTabPane.add(newWorkBookPane, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
}
}

10
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -267,7 +267,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
basePane.add(CenterRegionContainerPane.getInstance(), BorderLayout.CENTER);
laoyoutWestPane();
basePane.add(EastRegionContainerPane.getInstance(), BidiUtils.getBorderLayoutEast());
basePane.add(EastRegionContainerPane.getInstance(), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
basePane.setBounds(0, 0, contentWidth, contentHeight);
// 数值越小。越在底层
@ -479,7 +479,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
protected void laoyoutWestPane() {
basePane.add(WestRegionContainerPane.getInstance(), BidiUtils.getBorderLayoutWest());
basePane.add(WestRegionContainerPane.getInstance(), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
}
// 调整windows大小
@ -822,7 +822,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
DesignerOpenEmptyPanel designerOpenEmptyPanel = new DesignerOpenEmptyPanel();
BorderLayout layout = (BorderLayout) basePane.getLayout();
basePane.remove(layout.getLayoutComponent(BorderLayout.CENTER));
basePane.remove(layout.getLayoutComponent(BidiUtils.getBorderLayoutEast()));
basePane.remove(layout.getLayoutComponent(BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST));
basePane.add(designerOpenEmptyPanel, BorderLayout.CENTER);
resetToolkitByPlus(ToolBarMenuDock.NULLAVOID);
@ -976,10 +976,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
basePane.add(center, BorderLayout.CENTER);
}
if (west != null) {
basePane.add(west, BidiUtils.getBorderLayoutWest());
basePane.add(west, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
}
if (east != null) {
basePane.add(east, BidiUtils.getBorderLayoutEast());
basePane.add(east, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
}
jTemplate.setComposite();

14
designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@ -1,6 +1,7 @@
package com.fr.design.mainframe;
import com.fr.base.FRContext;
import com.fr.base.i18n.BidiUtils;
import com.fr.base.svg.IconUtils;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.DesignerEnvManager;
@ -1189,7 +1190,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
@Override
public void mouseClicked(MouseEvent e) {
if (e.getX() >= ARROW_RANGE_START) {
if ((BidiUtils.rtl() && e.getX() <= 30) || (!BidiUtils.rtl() && e.getX() >= ARROW_RANGE_START)) {
onPop();
}
}
@ -1204,7 +1205,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
@Override
public void mousePressed(MouseEvent e) {
if (e.getX() < ARROW_RANGE_START) {
if ((BidiUtils.rtl() && e.getX() > 30) || (!BidiUtils.rtl() && e.getX() < ARROW_RANGE_START)) {
mouseDownCompCoords = e.getPoint();
}
}
@ -1213,7 +1214,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
private MouseMotionListener mouseMotionListener = new MouseMotionListener() {
@Override
public void mouseMoved(MouseEvent e) {
if (e.getX() >= ARROW_RANGE_START) {
if ((BidiUtils.rtl() && e.getX() <= 30) || (!BidiUtils.rtl() && e.getX() >= ARROW_RANGE_START)) {
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
} else if (isMovable) {
setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
@ -1266,7 +1267,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
contentPane.setBackground(originColor);
contentPane.setLayout(new BorderLayout());
UILabel label = new UILabel(title);
contentPane.add(label, BorderLayout.WEST);
contentPane.add(label, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
contentPane.setBorder(new EmptyBorder(5, 10, 5, 0));
setLayout(new BorderLayout());
@ -1321,7 +1322,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
} else {
button = UIConstants.POP_BUTTON_UP;
}
SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, (ARROW_RANGE_START + 8), 4, null));
SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, BidiUtils.rtl() ? 0 : ARROW_RANGE_START + 8, 4, null));
}
}
@ -1375,8 +1376,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
}
public void adjustLocation() {
this.setLocation(
getLeftPane().getLocationOnScreen().x - CONTENT_WIDTH,
BidiUtils.rtl() ? getLeftPane().getLocationOnScreen().x : getLeftPane().getLocationOnScreen().x - CONTENT_WIDTH,
DesignerContext.getDesignerFrame().getLocationOnScreen().y + 228
);
}

2
designer-base/src/main/java/com/fr/design/mainframe/WestRegionContainerPane.java

@ -31,7 +31,7 @@ public class WestRegionContainerPane extends UIResizableContainer {
}
public WestRegionContainerPane() {
super(DesignerFrameFileDealerPane.getInstance(), BidiUtils.getStableConstantsRight());
super(DesignerFrameFileDealerPane.getInstance(), BidiUtils.rtl() ? com.fr.stable.Constants.LEFT : com.fr.stable.Constants.RIGHT);
setDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));

2
designer-base/src/main/java/com/fr/design/menu/ToolBarDef.java

@ -44,7 +44,7 @@ public class ToolBarDef {
* 一个static的方法生成一个JToolBar
*/
public static UIToolbar createJToolBar() {
UIToolbar toolbar = new UIToolbar(BidiUtils.getFlowLayoutLeft());
UIToolbar toolbar = new UIToolbar(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT);
toolbar.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
return toolbar;
}

2
designer-base/src/main/java/com/fr/design/present/DictPresentPane.java

@ -3,6 +3,7 @@ package com.fr.design.present;
import java.awt.BorderLayout;
import java.awt.event.ItemListener;
import com.fr.base.i18n.BidiUtils;
import com.fr.base.present.DictPresent;
import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.data.tabledata.Prepare4DataSourceChange;
@ -21,6 +22,7 @@ public class DictPresentPane extends FurtherBasicBeanPane<DictPresent> implement
dictionaryPane = new DictionaryPane();
this.setLayout(new BorderLayout());
this.add(dictionaryPane, BorderLayout.CENTER);
BidiUtils.applyOrientationByLocale(this);
}
@Override

1
designer-base/src/main/java/com/fr/design/utils/LinkStrUtils.java

@ -53,6 +53,7 @@ public class LinkStrUtils {
StringBuilder style = new StringBuilder("font-family:" + font.getFamily() + ";");
style.append("font-weight:").append(font.isBold() ? "bold" : "normal").append(";");
//style.append("margin-bottom:").append("5px").append(";");
style.append("font-size:").append(font.getSize()).append("pt;");
style.append("color:rgb(").append(fontColor.getRed()).append(",").append(fontColor.getGreen()).append(",").append(fontColor.getBlue()).append(");");
style.append("background-color: rgb(").append(backgroundColor.getRed()).append(",").append(backgroundColor.getGreen()).append(",").append(backgroundColor.getBlue()).append(");");

3
designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java

@ -4,6 +4,7 @@ import java.awt.*;
import javax.swing.*;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.icombobox.DictionaryComboBox;
@ -59,7 +60,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
}
UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 280, 20, advancePane);
this.add(uiExpandablePane);
BidiUtils.applyOrientationByLocale(this);
}
protected abstract Component createCenterPane();

2
designer-realize/src/main/java/com/fr/design/mainframe/ReportFloatPane.java

@ -1,5 +1,6 @@
package com.fr.design.mainframe;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.constants.UIConstants;
@ -71,6 +72,7 @@ public class ReportFloatPane extends JPanel {
JPanel leftTopPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
leftTopPane.setBorder(BorderFactory.createEmptyBorder(12, 5, 0, 15));
this.add(leftTopPane, BorderLayout.NORTH);
BidiUtils.applyOrientationByLocale(this);
}
private void initInsertToolBar() {

3
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java

@ -1,5 +1,6 @@
package com.fr.design.mainframe.cell.settingpane;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.expand.ExpandLeftFatherPane;
@ -63,7 +64,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
horizontalExpandableCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_ExpandD_Horizontal_Extendable"));
verticalExpandableCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_ExpandD_Vertical_Extendable"));
initAllNames();
return layoutPane();
return BidiUtils.applyOrientationByLocale(layoutPane());
}
private void initAllNames() {

15
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@ -1,6 +1,7 @@
package com.fr.design.mainframe.cell.settingpane;
import com.fr.base.Style;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.link.MessageWithLink;
@ -41,6 +42,7 @@ import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.ButtonGroup;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
@ -55,6 +57,7 @@ import java.awt.Insets;
import java.awt.Rectangle;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.text.Bidi;
import java.util.ArrayList;
/**
@ -149,7 +152,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
contentPane.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Desensitization"), HEAD_WDITH, HEAD_HEIGTH, desensitizePane()));
// VerticalFlowLayout 与 实现的滚动条有冲突,因此再加一层panel
JPanel jPanel = new JPanel();
jPanel.add(contentPane);
jPanel.add(BidiUtils.applyOrientationByLocale(contentPane));
initAllNames();
return jPanel;
}
@ -226,9 +229,13 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
return new Insets(LayoutConstants.VGAP_MEDIUM, 0, LayoutConstants.VGAP_MEDIUM, 0);
}
};
VerticalFlowLayout verticalFlowLayout = new VerticalFlowLayout(VerticalFlowLayout.CENTER, 0, 0);
verticalFlowLayout.setAlignLeft(true);
basicPane.setLayout(verticalFlowLayout);
basicPane.setLayout(new BoxLayout(basicPane, BoxLayout.Y_AXIS));
defaultAutoRadioButton.setAlignmentX(BidiUtils.rtl() ? Component.RIGHT_ALIGNMENT : Component.LEFT_ALIGNMENT);
noAutoRadioButton.setAlignmentX(BidiUtils.rtl() ? Component.RIGHT_ALIGNMENT : Component.LEFT_ALIGNMENT);
autoHeightRadioButton.setAlignmentX(BidiUtils.rtl() ? Component.RIGHT_ALIGNMENT : Component.LEFT_ALIGNMENT);
autoWidthRadioButton.setAlignmentX(BidiUtils.rtl() ? Component.RIGHT_ALIGNMENT : Component.LEFT_ALIGNMENT);
basicPane.add(defaultAutoRadioButton);
basicPane.add(noAutoRadioButton);
basicPane.add(autoHeightRadioButton);

3
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java

@ -1,5 +1,6 @@
package com.fr.design.mainframe.cell.settingpane.desensitization;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
@ -97,7 +98,7 @@ public class CellDesensitizationGroupsPane extends JPanel {
JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
controlPane.setBackground(Color.WHITE);
controlPane.add(getbuttonPane(), BorderLayout.WEST);
controlPane.add(getbuttonPane(), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
JPanel pane = new JPanel(new BorderLayout(4, 4));
pane.add(editTable, BorderLayout.CENTER);

2
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java

@ -1,5 +1,6 @@
package com.fr.design.mainframe.cell.settingpane.desensitization.model;
import com.fr.base.i18n.BidiUtils;
import com.fr.base.operator.org.OrganizationOperator;
import com.fr.data.desensitize.rule.DesensitizationRuleManager;
import com.fr.data.desensitize.rule.base.DesensitizationRule;
@ -103,6 +104,7 @@ public class DesensitizationCellPane extends BasicBeanPane {
emptyTextField.setOpaque(false);
editPanel.add(initTableCellPanel());
BidiUtils.applyOrientationByLocale(editPanel, ruleTextField);
}

3
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java

@ -3,6 +3,7 @@ package com.fr.design.mainframe.cell.settingpane.style;
import com.fr.base.CellBorderStyle;
import com.fr.base.NameStyle;
import com.fr.base.Style;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.actions.utils.ReportActionUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicPane;
@ -14,6 +15,7 @@ import com.fr.design.style.BorderUtils;
import javax.swing.*;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.text.Bidi;
import java.util.ArrayList;
import java.util.List;
@ -40,6 +42,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
tabPane.setDrawLine(false);
tabPane.setBorder(BorderFactory.createLineBorder(UIConstants.SHADOW_GREY));
tabPane.setLayout(new GridLayout(1, 3, 0, 0));
BidiUtils.applyOrientationByLocale(this);
}
public static void main(String[] args) {

5
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java

@ -3,6 +3,7 @@ package com.fr.design.mainframe.cell.settingpane.style;
import com.fr.base.CellBorderStyle;
import com.fr.base.NameStyle;
import com.fr.base.Style;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.event.UIObserver;
@ -96,10 +97,10 @@ public class StylePane extends BasicPane implements UIObserver {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
return TableLayoutHelper.createGapTableLayoutPane(
return BidiUtils.applyOrientationByLocale(TableLayoutHelper.createGapTableLayoutPane(
new Component[][]{ new Component[] { uiLabel, followingThemeButtonGroup} },
new double[] { p }, new double[] { p, f},
IntervalConstants.INTERVAL_L1, 0);
IntervalConstants.INTERVAL_L1, 0));
}
private void onFollowingThemeSettingChanged(int selectedIndex, boolean isFollowingTheme) {

2
designer-realize/src/main/java/com/fr/design/present/BarCodePane.java

@ -1,5 +1,6 @@
package com.fr.design.present;
import com.fr.base.i18n.BidiUtils;
import com.fr.code.bar.core.BarcodeAttr;
import com.fr.code.BarcodeImpl;
import com.fr.code.bar.core.BarCodeUtils;
@ -59,6 +60,7 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
public BarCodePane() {
this.initComponents();
addListener();
BidiUtils.applyOrientationByLocale(this);
}
private void initComponents() {

4
designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java

@ -1,5 +1,6 @@
package com.fr.design.present;
import com.fr.base.i18n.BidiUtils;
import com.fr.code.bar.BarcodeException;
import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.border.UIRoundedBorder;
@ -100,7 +101,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"), UILabel.LEFT), textField},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT), textField},
new Component[]{borderPane, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_IntPart"), UILabel.LEFT), groupPane(intPartSpinner)},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Deci_Part"), UILabel.LEFT), groupPane(deciPartSpinner)}
@ -110,6 +111,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
JPanel linePane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_HUGER, LayoutConstants.VGAP_LARGE);
this.setLayout(new BorderLayout());
this.add(linePane, BorderLayout.CENTER);
BidiUtils.applyOrientationByLocale(this);
textField.getDocument().addDocumentListener(listener);

1
designer-realize/src/main/java/com/fr/design/widget/CellWidgetCardPane.java

@ -1,5 +1,6 @@
package com.fr.design.widget;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.data.DataCreatorUI;
import com.fr.design.dialog.AttrScrollPane;

3
designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java

@ -1,5 +1,6 @@
package com.fr.design.widget;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.fun.WidgetDesignHandler;
import com.fr.design.gui.core.WidgetOption;
@ -87,7 +88,7 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Select_Widget")), emptyLabel, editorTypeComboBox},
};
JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
return jPanel;
return BidiUtils.applyOrientationByLocale(jPanel);
}
protected CellWidgetCardPane initWidgetCardPane(ElementCasePane pane) {

3
designer-realize/src/main/java/com/fr/design/widget/ui/BasicWidgetPropertySettingPane.java

@ -1,5 +1,6 @@
package com.fr.design.widget.ui;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
@ -46,7 +47,7 @@ public class BasicWidgetPropertySettingPane extends BasicPane {
pane.setBorder(BorderFactory.createEmptyBorder(10,0,10,0));
this.add(pane, BorderLayout.CENTER);
BidiUtils.applyOrientationByLocale(this);
}
@Override

2
designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxDefinePane.java

@ -1,5 +1,6 @@
package com.fr.design.widget.ui;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.designer.IntervalConstants;
@ -59,6 +60,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
pane.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 0));
this.add(uiExpandablePane);
BidiUtils.applyOrientationByLocale(this);
}
protected void initExtraPane() {

5
designer-realize/src/main/java/com/fr/design/widget/ui/CustomWritableRepeatEditorPane.java

@ -1,6 +1,7 @@
package com.fr.design.widget.ui;
import com.fr.base.GraphHelper;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
@ -40,8 +41,8 @@ public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRe
public JPanel setValidatePane(){
JPanel otherContentPane = super.setValidatePane();
JPanel jPanel = GUICoreUtils.createFlowPane(new JComponent[]{customDataCheckBox}, FlowLayout.LEFT, 0);
otherContentPane.add(jPanel, BorderLayout.CENTER);
customDataCheckBox.setAlignmentX(BidiUtils.rtl() ? Component.RIGHT_ALIGNMENT : Component.LEFT_ALIGNMENT);
otherContentPane.add(customDataCheckBox);
return otherContentPane;
}

9
designer-realize/src/main/java/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java

@ -1,6 +1,7 @@
package com.fr.design.widget.ui;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
@ -48,9 +49,11 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
}
public JPanel setValidatePane(){
JPanel otherContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
JPanel jPanel = GUICoreUtils.createFlowPane(new JComponent[]{directWriteCheckBox}, FlowLayout.LEFT, 0);
otherContentPane.add(jPanel, BorderLayout.NORTH);
JPanel otherContentPane = new JPanel();
otherContentPane.setLayout(new BoxLayout(otherContentPane, BoxLayout.Y_AXIS));
directWriteCheckBox.setAlignmentX(BidiUtils.rtl() ? Component.RIGHT_ALIGNMENT : Component.LEFT_ALIGNMENT);
otherContentPane.add(directWriteCheckBox);
otherContentPane.add(Box.createVerticalStrut(10));
return otherContentPane;
}

2
designer-realize/src/main/java/com/fr/design/widget/ui/FieldEditorDefinePane.java

@ -1,5 +1,6 @@
package com.fr.design.widget.ui;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.beans.ErrorMsgTextFieldAdapter;
@ -181,6 +182,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Validate"), 280, 24, validatePane);
this.add(uiExpandablePane, BorderLayout.CENTER);
BidiUtils.applyOrientationByLocale(this);
}
public JPanel setValidatePane() {

3
designer-realize/src/main/java/com/fr/design/widget/ui/IframeEditorDefinePane.java

@ -1,5 +1,6 @@
package com.fr.design.widget.ui;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.dialog.DialogActionListener;
import com.fr.design.dialog.UIDialog;
@ -73,7 +74,7 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 24, contentPane);
this.add(uiExpandablePane, BorderLayout.NORTH);
BidiUtils.applyOrientationByLocale(this);
}
ActionListener parameterListener = new ActionListener() {

3
designer-realize/src/main/java/com/fr/design/widget/ui/WaterMarkDictPane.java

@ -1,5 +1,6 @@
package com.fr.design.widget.ui;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
@ -31,7 +32,7 @@ public class WaterMarkDictPane extends JPanel {
int[][] rowCount = {{1, 1}};
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
// panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
this.add(panel, BorderLayout.CENTER);
this.add(BidiUtils.applyOrientationByLocale(panel), BorderLayout.CENTER);
}
public void populate(WaterMark waterMark) {

3
designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java

@ -1,5 +1,6 @@
package com.fr.design.widget.ui.btn;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.ilable.UILabel;
@ -42,7 +43,7 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, borderPanel);
this.add(advancedPane);
BidiUtils.applyOrientationByLocale(this);
}
@Override

2
designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

@ -2,6 +2,7 @@ package com.fr.quickeditor;
import com.fr.base.GraphHelper;
import com.fr.base.Style;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.file.HistoryTemplateListCache;
@ -173,6 +174,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
this.setLayout(new BorderLayout());
this.add(TableLayoutHelper.createGapTableLayoutPane(components, scrollContentRowSize, columnSize, HGAP, VGAP), BorderLayout.CENTER);
}
BidiUtils.applyOrientationByLocale(this);
}
/**

Loading…
Cancel
Save