Browse Source

插入-图片

persist/11.0-arabic
obo 6 months ago
parent
commit
95176e9808
  1. 3
      designer-base/src/main/java/com/fr/design/report/SelectImagePane.java
  2. 11
      designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java

3
designer-base/src/main/java/com/fr/design/report/SelectImagePane.java

@ -1,6 +1,7 @@
package com.fr.design.report; package com.fr.design.report;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.ImgChooseWrapper; import com.fr.design.gui.frpane.ImgChooseWrapper;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
@ -83,7 +84,7 @@ public class SelectImagePane extends BasicPane {
previewOwnerPane.add(new JScrollPane(previewPane)); previewOwnerPane.add(new JScrollPane(previewPane));
JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
previewContainerPane.add(selectFilePane, BorderLayout.EAST); previewContainerPane.add(selectFilePane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
selectFilePane.setBorder(BorderFactory selectFilePane.setBorder(BorderFactory
.createEmptyBorder(8, 2, 4, 0)); .createEmptyBorder(8, 2, 4, 0));

11
designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java

@ -4,6 +4,7 @@ package com.fr.design.chart;
*/ */
import com.fr.base.chart.chartdata.CallbackEvent; import com.fr.base.chart.chartdata.CallbackEvent;
import com.fr.base.i18n.BidiUtils;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.charttypes.ChartTypeManager; import com.fr.chart.charttypes.ChartTypeManager;
import com.fr.chartx.attr.ChartProvider; import com.fr.chartx.attr.ChartProvider;
@ -71,11 +72,13 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven
JScrollPane subListPane = new JScrollPane(iconViewList); JScrollPane subListPane = new JScrollPane(iconViewList);
//iconPane.add //iconPane.add
mainTypeList.setSelectedIndex(0); mainTypeList.setSelectedIndex(0);
Component left = BidiUtils.rtl() ? subListPane :typeScrollPane;
JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane); Component right = BidiUtils.rtl() ? typeScrollPane :subListPane;
spane.setDividerLocation(120); JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, left, right);
spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"))); spane.setDividerLocation(BidiUtils.rtl() ? 500 : 120);
spane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"))));
this.add(spane); this.add(spane);
BidiUtils.applyOrientationByLocale(this);
iconViewList.setSelectedIndex(0); iconViewList.setSelectedIndex(0);
} }

Loading…
Cancel
Save