Browse Source

INO-21074 主面板、移动端面板、UICombox

persist/11.0-arabic^2
obo 8 months ago
parent
commit
3359ddea73
  1. 6
      designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java
  2. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java
  3. 4
      designer-realize/src/main/java/com/fr/start/MainDesigner.java

6
designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java

@ -1,5 +1,6 @@
package com.fr.design.gui.icheckbox;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.event.GlobalNameListener;
import com.fr.design.event.GlobalNameObserver;
@ -40,18 +41,21 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
super(string);
setUI(new UICheckBoxUI());
initListener();
BidiUtils.setOrientationByLocale(this);
}
public UICheckBox() {
super();
setUI(new UICheckBoxUI());
initListener();
BidiUtils.setOrientationByLocale(this);
}
public UICheckBox(String locText, boolean b) {
super(locText, b);
setUI(new UICheckBoxUI());
initListener();
BidiUtils.setOrientationByLocale(this);
}
public UICheckBox(String locText, boolean b, boolean markMnemonic) {
@ -59,12 +63,14 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
setUI(new UICheckBoxUI());
initListener();
this.markMnemonic = markMnemonic;
BidiUtils.setOrientationByLocale(this);
}
public UICheckBox(String text, Icon icon) {
super(text, icon);
setUI(new UICheckBoxUI());
initListener();
BidiUtils.setOrientationByLocale(this);
}
protected void initListener() {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java

@ -1,5 +1,6 @@
package com.fr.design.widget.ui.designer.mobile;
import com.fr.base.i18n.BidiUtils;
import com.fr.base.iofile.attr.FormBodyPaddingAttrMark;
import com.fr.design.designer.beans.events.DesignerEvent;
import com.fr.design.designer.creator.XCreator;
@ -74,7 +75,8 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
appRelayoutCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_App_ReLayout"), true);
appRelayoutCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
panel.add(appRelayoutCheck);
panel.add(appRelayoutCheck, BorderLayout.LINE_START);
BidiUtils.applyOrientationByLocale(panel);
final JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
panelWrapper.add(panel, BorderLayout.NORTH);

4
designer-realize/src/main/java/com/fr/start/MainDesigner.java

@ -462,7 +462,7 @@ public class MainDesigner extends BaseDesigner {
return super.resetToolBar(toolbarComponent, plus);
} else {
JPanel toolbarPane;
toolbarPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, TOOLBARPANEVGAP));
toolbarPane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, TOOLBARPANEVGAP));
Dimension dim = new Dimension();
dim.height = plus.getToolBarHeight();
toolbarPane.setPreferredSize(dim);
@ -471,7 +471,7 @@ public class MainDesigner extends BaseDesigner {
for (int i = 0; i < paneArray.length; i++) {
toolbarPane.add(paneArray[i]);
}
return toolbarPane;
return BidiUtils.applyOrientationByLocale(toolbarPane);
}
}

Loading…
Cancel
Save