fanruan
/
design
6
1
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

标签创建方式重构还原-designer-realize部分

persist/11.0-arabic
obo 6 months ago
parent
b8ad2b80af
commit
2f564fbd7c
23 changed files with 53 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java
  2. 6
      designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java
  3. 9
      designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java
  4. 12
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  5. 4
      designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java
  6. 2
      designer-realize/src/main/java/com/fr/design/report/SubReportPane.java
  7. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java
  8. 5
      designer-realize/src/main/java/com/fr/design/webattr/CommonPane.java
  9. 2
      designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
  10. 11
      designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java
  11. 7
      designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java
  12. 11
      designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java
  13. 2
      designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java
  14. 1
      designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
  15. 3
      designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java
  16. 3
      designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java
  17. 2
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  18. 13
      designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java
  19. 4
      designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
  20. 5
      designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java
  21. 14
      designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java
  22. 2
      designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java
  23. 2
      designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java

4
designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java
Unescape View File

@ -155,8 +155,8 @@ public class SelectedDataColumnPane extends BasicPane {
}; };
columnNameComboBox.setEditable(true); columnNameComboBox.setEditable(true);
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
UILabel dsLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData"), ":")); UILabel dsLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData") + ":");
UILabel dcLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Data_Column"), ":")); UILabel dcLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Data_Column") + ":");
if (showParameterButton) { if (showParameterButton) {
dsLabel.setPreferredSize(new Dimension(200, 25)); dsLabel.setPreferredSize(new Dimension(200, 25));
dcLabel.setPreferredSize(new Dimension(200, 25)); dcLabel.setPreferredSize(new Dimension(200, 25));

6
designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java
Unescape View File

@ -131,9 +131,9 @@ public class HeaderFooterEditPane extends JPanel {
centerHFContainer.setContentChangeListener(contentChangeListener); centerHFContainer.setContentChangeListener(contentChangeListener);
rightHFContainer.setContentChangeListener(contentChangeListener); rightHFContainer.setContentChangeListener(contentChangeListener);
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_Left_Section") + ":", leftHFContainer));
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_Center_Section") + ":", centerHFContainer));
controlContentPane.add(createContainerSection(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Right_Section"), ":"), rightHFContainer)); controlContentPane.add(createContainerSection(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Right_Section") + ":", rightHFContainer));
//set current HFContainer //set current HFContainer
setCurrentHFContainer(leftHFContainer); setCurrentHFContainer(leftHFContainer);

9
designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java
Unescape View File

@ -1,7 +1,6 @@
package com.fr.design.report; package com.fr.design.report;
import com.fr.base.extension.FileExtension; import com.fr.base.extension.FileExtension;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
@ -67,10 +66,10 @@ public class ImageExportPane extends AbstractExportPane {
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
JComponent[][] comps = { JComponent[][] comps = {
{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Image_Export_Resolution"), ":")), this.globalResolutionBtnS, this.globalResolutionBtnM, this.globalResolutionBtnL}, {new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Resolution") + ":"), this.globalResolutionBtnS, this.globalResolutionBtnM, this.globalResolutionBtnL},
{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Format") , ":")), this.globalFormatJpg, null, this.globalFormatPng}, {new UILabel(Toolkit.i18nText("Fine-Design_Report_Format") + ":"), this.globalFormatJpg, null, this.globalFormatPng},
{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Image_Export_Rendering_Quality") , ":")), this.globalRenderQuality, null, this.globalRenderSpeed}, {new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Rendering_Quality") + ":"), this.globalRenderQuality, null, this.globalRenderSpeed},
{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Image_Export_Typesetting") , ":")), this.templateThumbnail, null, this.templatePaging} {new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Typesetting") + ":"), this.templateThumbnail, null, this.templatePaging}
}; };
centerPane.add( centerPane.add(
TableLayoutHelper.createCommonTableLayoutPane( TableLayoutHelper.createCommonTableLayoutPane(

12
designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
Unescape View File

@ -282,12 +282,12 @@ public class PageSetupPane extends BasicPane {
JPanel marginLeftTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel marginLeftTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
marginLeftPane.add(marginLeftTextPane); marginLeftPane.add(marginLeftTextPane);
marginLeftTextPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Duplicate"), ":"))); marginLeftTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Duplicate") + ":"));
marginTopUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginTopUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
marginLeftTextPane.add(marginTopUnitFieldPane); marginLeftTextPane.add(marginTopUnitFieldPane);
JPanel marginLeftUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel marginLeftUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
marginLeftPane.add(marginLeftUnitPane); marginLeftPane.add(marginLeftUnitPane);
marginLeftUnitPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom"), ":"))); marginLeftUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom") + ":"));
marginBottomUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginBottomUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
marginLeftUnitPane.add(marginBottomUnitFieldPane); marginLeftUnitPane.add(marginBottomUnitFieldPane);
@ -298,13 +298,13 @@ public class PageSetupPane extends BasicPane {
// peter:这个一个垂直的上下的字符panel. // peter:这个一个垂直的上下的字符panel.
JPanel marginRightTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel marginRightTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
marginRightPane.add(marginRightTextPane); marginRightPane.add(marginRightTextPane);
marginRightTextPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), ":"))); marginRightTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left") + ":"));
marginLeftUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginLeftUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
marginRightTextPane.add(marginLeftUnitFieldPane); marginRightTextPane.add(marginLeftUnitFieldPane);
JPanel marginRightUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel marginRightUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
marginRightPane.add(marginRightUnitPane); marginRightPane.add(marginRightUnitPane);
marginRightUnitPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right"), ":"))); marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right") + ":"));
marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
marginRightUnitPane.add(marginRightUnitFieldPane); marginRightUnitPane.add(marginRightUnitFieldPane);
@ -324,7 +324,7 @@ public class PageSetupPane extends BasicPane {
// header height. // header height.
JPanel headerHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel headerHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
hfHeightPane.add(headerHeightPane); hfHeightPane.add(headerHeightPane);
headerHeightPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Header"), ":"))); headerHeightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Header") + ":"));
headerUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); headerUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
headerHeightPane.add(headerUnitFieldPane); headerHeightPane.add(headerUnitFieldPane);
@ -332,7 +332,7 @@ public class PageSetupPane extends BasicPane {
// footer height. // footer height.
JPanel footerHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel footerHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
hfHeightPane.add(footerHeightPane); hfHeightPane.add(footerHeightPane);
footerHeightPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Footer"), ":"))); footerHeightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Footer") + ":"));
footerUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); footerUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
footerHeightPane.add(footerUnitFieldPane); footerHeightPane.add(footerUnitFieldPane);

4
designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java
Unescape View File

@ -311,12 +311,12 @@ public class ReportColumnsPane extends BasicPane{
rowPane.setBorder(explainBorder); rowPane.setBorder(explainBorder);
rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13)); rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13));
rowPane.setPreferredSize(new Dimension(500,80)); rowPane.setPreferredSize(new Dimension(500,80));
rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Data"), ":"))); rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Data") + ":"));
repeatColDataTextField = new UITextField(); repeatColDataTextField = new UITextField();
repeatColDataTextField.setPreferredSize(new Dimension(107,24)); repeatColDataTextField.setPreferredSize(new Dimension(107,24));
rowPane.add(repeatColDataTextField); rowPane.add(repeatColDataTextField);
rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 "))); rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 ")));
copyLabel = new UILabel(BidiUtils.reverseConcatenateStrings(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":")); copyLabel = new UILabel(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":");
rowPane.add(copyLabel); rowPane.add(copyLabel);
copyTitleTextField = new UITextField(); copyTitleTextField = new UITextField();

2
designer-realize/src/main/java/com/fr/design/report/SubReportPane.java
Unescape View File

@ -46,7 +46,7 @@ public class SubReportPane extends BasicPane {
JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
// northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); // northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout());
northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null)); northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null));
northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Location"), ":")), BorderLayout.LINE_START); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Location") + ":"), BorderLayout.LINE_START);
northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER); northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER);
pathTextField.setEditable(false); pathTextField.setEditable(false);
UIButton browseButton = new UIButton("..."); UIButton browseButton = new UIButton("...");

2
designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java
Unescape View File

@ -210,7 +210,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
protected JPanel initWriteFrozenPane() { protected JPanel initWriteFrozenPane() {
JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
// 填报冻结 // 填报冻结
UILabel writeLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen"), ":")); UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen") + ":");
JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
writeLabelPanel.add(writeLabel); writeLabelPanel.add(writeLabel);
writePanel.add(writeLabelPanel, BorderLayout.NORTH); writePanel.add(writeLabelPanel, BorderLayout.NORTH);

5
designer-realize/src/main/java/com/fr/design/webattr/CommonPane.java
Unescape View File

@ -8,7 +8,6 @@ import java.awt.BorderLayout;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JComponent; import javax.swing.JComponent;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -42,8 +41,8 @@ public class CommonPane extends JPanel {
this.cacheValidateTimeEditor = new LongEditor(); this.cacheValidateTimeEditor = new LongEditor();
JComponent[][] comps = { JComponent[][] comps = {
{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title"), ":")), this.titleTextField, null}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title") + ":"), this.titleTextField, null},
{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cache_Validate_Time"), ":")), this.cacheValidateTimeEditor, new UILabel("milliseconds")} {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cache_Validate_Time") + ":"), this.cacheValidateTimeEditor, new UILabel("milliseconds")}
}; };
this.add( this.add(

2
designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
Unescape View File

@ -420,7 +420,7 @@ public class EditToolBar extends BasicPane {
double rowSize[] = {p, p}; double rowSize[] = {p, p};
double columnSize[] = {p, p}; double columnSize[] = {p, p};
Component[][] coms = new Component[][]{{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Printer_Alias"), ":")), nameField}, {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Icon"), ":")), iconPane}}; Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Printer_Alias") + ":"), nameField}, {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Icon"), ":")), iconPane}};
JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize);

11
designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java
Unescape View File

@ -1,6 +1,5 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
@ -33,12 +32,12 @@ public class ErrorTemplatePane extends BasicBeanPane<String> {
reportletNamePane.add(this.templateField); reportletNamePane.add(this.templateField);
Component[][] components = { Component[][] components = {
{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Path"), ":")), reportletNamePane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Path") + ":"), reportletNamePane},
{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Parameters"), ":")), null}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Parameters") + ":"), null},
{new UILabel(BidiUtils.reverseConcatenateStrings("message", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))}, {new UILabel("message" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))},
{new UILabel(BidiUtils.reverseConcatenateStrings("charset", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))}, {new UILabel("charset" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))},
{new UILabel(BidiUtils.reverseConcatenateStrings("exception", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))} {new UILabel("exception" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))}
}; };
JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

7
designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java
Unescape View File

@ -1,7 +1,6 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import com.fr.base.ConfigManager; import com.fr.base.ConfigManager;
import com.fr.base.i18n.BidiUtils;
import com.fr.config.Configuration; import com.fr.config.Configuration;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
@ -117,9 +116,9 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
double[] columnSize = {p, p, p, p}; double[] columnSize = {p, p, p, p};
double[] rowSize = {p, p, p, p, p}; double[] rowSize = {p, p, p, p, p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.TRAILING), buttonPane, null, null}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.TRAILING), buttonPane, null, null},
new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_PageSetup_Page"), ":"), UILabel.TRAILING), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_PageSetup_Page") + ":", UILabel.TRAILING), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox},
new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Paging_Settings"), ":"), UILabel.TRAILING), isPageFixedRowBox, linesPerPagePane, null}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Paging_Settings") + ":", UILabel.TRAILING), isPageFixedRowBox, linesPerPagePane, null},
new Component[]{null, tipLabel, null, null}, new Component[]{null, tipLabel, null, null},
new Component[]{isUseToolBarCheckBox, editToolBarButtonPanel, null, null} new Component[]{isUseToolBarCheckBox, editToolBarButtonPanel, null, null}
}; };

11
designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java
Unescape View File

@ -102,7 +102,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
} }
}); });
UILabel linesPerPageLabel = new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Rows_Per_Page"), "：")); UILabel linesPerPageLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Rows_Per_Page") + "：");
Component[][] rowCountTextFieldComponents = {{linesPerPageLabel,pageFixedRowCountTextField}}; Component[][] rowCountTextFieldComponents = {{linesPerPageLabel,pageFixedRowCountTextField}};
JPanel linesPerPagePane = TableLayoutHelper.createTableLayoutPane(rowCountTextFieldComponents, new double[]{p}, new double[]{p,p}); JPanel linesPerPagePane = TableLayoutHelper.createTableLayoutPane(rowCountTextFieldComponents, new double[]{p}, new double[]{p,p});
UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Page_Fixed_Row_Tip")); UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Page_Fixed_Row_Tip"));
@ -111,9 +111,9 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
double[] columnSize = {p, p, p, p}; double[] columnSize = {p, p, p, p};
double[] rowSize = {p, p, p, p}; double[] rowSize = {p, p, p, p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{createBidiUILabel("Fine-Design_Report_Show_Location"), buttonpane, null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.TRAILING), buttonpane, null, null},
new Component[]{createBidiUILabel("Fine-Design_Report_PageSetup_Page"), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Page") + ":", UILabel.TRAILING), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox},
new Component[]{createBidiUILabel("Fine-Design_Report_Paging_Settings"), isPageFixedRowBox, linesPerPagePane, null}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Paging_Settings") + ":", UILabel.TRAILING), isPageFixedRowBox, linesPerPagePane, null},
new Component[]{null, tipLabel, null, null} new Component[]{null, tipLabel, null, null}
}; };
@ -121,9 +121,6 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
} }
private UILabel createBidiUILabel(String i18nKey) {
return new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText(i18nKey), ":"), UILabel.TRAILING);
}
@Override @Override
protected void checkEnabled(boolean isSelected) { protected void checkEnabled(boolean isSelected) {

2
designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java
Unescape View File

@ -323,7 +323,7 @@ public class ServerPrinterPane extends BasicPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(20, 5, 0, 0)); this.setBorder(BorderFactory.createEmptyBorder(20, 5, 0, 0));
JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
centerPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer"), ":")), BorderLayout.WEST); centerPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer") + ":"), BorderLayout.WEST);
DefaultComboBoxModel printerComboModel = new DefaultComboBoxModel(); DefaultComboBoxModel printerComboModel = new DefaultComboBoxModel();

1
designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
Unescape View File

@ -31,7 +31,6 @@ import javax.swing.table.TableModel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.ComponentOrientation;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;

3
designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java
Unescape View File

@ -1,7 +1,6 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import com.fr.base.ConfigManager; import com.fr.base.ConfigManager;
import com.fr.base.i18n.BidiUtils;
import com.fr.config.Configuration; import com.fr.config.Configuration;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
@ -33,7 +32,7 @@ public class ViewToolBarPane extends AbstractEditToolBarPane {
private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar")); private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar"));
private UIButton editToolBarButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); private UIButton editToolBarButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
private UILabel showListenersLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners"), ":")); private UILabel showListenersLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners") + ":");
private UICheckBox sortCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Sort_Sort")); private UICheckBox sortCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Sort_Sort"));
private UICheckBox conditonFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Selection_Filter")); private UICheckBox conditonFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Selection_Filter"));
private UICheckBox listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_List_Filter")); private UICheckBox listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_List_Filter"));

3
designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java
Unescape View File

@ -1,6 +1,5 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
@ -35,7 +34,7 @@ public class ViewWebSettingPane extends WebSettingPane<WebView> {
sortCheckBox.setSelected(true); sortCheckBox.setSelected(true);
conditionFilterBox.setSelected(true); conditionFilterBox.setSelected(true);
listFilterBox.setSelected(true); listFilterBox.setSelected(true);
return GUICoreUtils.createFlowPane(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ViewPreview"), ":")), return GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ViewPreview") + ":"),
sortCheckBox, conditionFilterBox, listFilterBox}, FlowLayout.LEADING, 6); sortCheckBox, conditionFilterBox, listFilterBox}, FlowLayout.LEADING, 6);
} }

2
designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
Unescape View File

@ -45,7 +45,7 @@ public class WebCssPane extends BasicPane {
chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection")); chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection"));
chooseFile.setPreferredSize(new Dimension(75, 23)); chooseFile.setPreferredSize(new Dimension(75, 23));
chooseFile.addActionListener(chooseFileListener); chooseFile.addActionListener(chooseFileListener);
northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File"), ":")), FlowLayout.LEFT); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":"), FlowLayout.LEFT);
northPane.add(localText, FlowLayout.CENTER); northPane.add(localText, FlowLayout.CENTER);
northPane.add(chooseFile, FlowLayout.RIGHT); northPane.add(chooseFile, FlowLayout.RIGHT);
outnorth.add(northPane,BorderLayout.NORTH); outnorth.add(northPane,BorderLayout.NORTH);

13
designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java
Unescape View File

@ -1,8 +1,5 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import com.fine.swing.ui.layout.Column;
import com.fine.swing.ui.layout.Layouts;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
@ -25,12 +22,6 @@ import java.awt.event.ItemListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.fine.swing.ui.layout.Layouts.cell;
import static com.fine.swing.ui.layout.Layouts.column;
import static com.fine.swing.ui.layout.Layouts.fix;
import static com.fine.swing.ui.layout.Layouts.flex;
import static com.fine.swing.ui.layout.Layouts.row;
public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane<ReportWebAttr> { public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane<ReportWebAttr> {
private static final String[] CHOOSEITEM = new String[] { private static final String[] CHOOSEITEM = new String[] {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_I_Want_To_Set_Single"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_I_Want_To_Set_Single"),
@ -50,12 +41,12 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
JPanel buttonPane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 6)); JPanel buttonPane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 6));
choseComboBox = new UIComboBox(CHOOSEITEM); choseComboBox = new UIComboBox(CHOOSEITEM);
choseComboBox.addItemListener(itemListener); choseComboBox.addItemListener(itemListener);
buttonPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set"), ":"))); buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set") + ":"));
buttonPane.add(choseComboBox); buttonPane.add(choseComboBox);
dragToolBarPane = new ToolBarDragPane(); dragToolBarPane = new ToolBarDragPane();
dragToolBarPane.setDefaultToolBar(getDefaultToolBarManager(), getToolBarInstance()); dragToolBarPane.setDefaultToolBar(getDefaultToolBarManager(), getToolBarInstance());
JPanel eventpanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel eventpanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
eventpanel.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Set"), ":")), BorderLayout.NORTH); eventpanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Set") + ":"), BorderLayout.NORTH);
eventPane = new EventPane(getEventNames()); eventPane = new EventPane(getEventNames());
eventpanel.add(eventPane, BorderLayout.CENTER); eventpanel.add(eventPane, BorderLayout.CENTER);

4
designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
Unescape View File

@ -46,10 +46,10 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
private UILabel sheetShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Label_Page_Display_Position")); private UILabel sheetShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Label_Page_Display_Position"));
private UIRadioButton centerRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Center_Display")); private UIRadioButton centerRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Center_Display"));
private UIRadioButton leftRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Display")); private UIRadioButton leftRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Display"));
private UILabel rptShowLocationLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.LEADING); private UILabel rptShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.LEADING);
private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar")); private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar"));
private UIButton editToolBarButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); private UIButton editToolBarButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
private UILabel showListenersLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners"), ":")); private UILabel showListenersLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners") + ":");
private UICheckBox unloadCheck; private UICheckBox unloadCheck;
private UICheckBox showWidgets; private UICheckBox showWidgets;
private UICheckBox isAutoStash;//自动暂存 private UICheckBox isAutoStash;//自动暂存

5
designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java
Unescape View File

@ -1,7 +1,6 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.ibutton.UIColorButton; import com.fr.design.gui.ibutton.UIColorButton;
@ -43,7 +42,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
@Override @Override
protected JPanel createOtherSetPane() { protected JPanel createOtherSetPane() {
colorBox = new UICheckBox(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background_Of_Current_Row"), ":")); colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background_Of_Current_Row") + ":");
colorBox.setSelected(true); colorBox.setSelected(true);
colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png")); colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));
colorBox.addActionListener(new ActionListener() { colorBox.addActionListener(new ActionListener() {
@ -65,7 +64,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
JPanel sheetPane = GUICoreUtils.createFlowPane(new Component[]{sheetShowLocationLabel, topRadioButton, bottomRadioButton}, FlowLayout.LEADING); JPanel sheetPane = GUICoreUtils.createFlowPane(new Component[]{sheetShowLocationLabel, topRadioButton, bottomRadioButton}, FlowLayout.LEADING);
//Sean: 报表显示位置since 706 //Sean: 报表显示位置since 706
rptShowLocationLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.LEADING); rptShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.LEADING);
centerRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Center_Display")); centerRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Center_Display"));
leftRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Display")); leftRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Display"));
ButtonGroup rptShowButtonGroup = new ButtonGroup(); ButtonGroup rptShowButtonGroup = new ButtonGroup();

14
designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java
Unescape View File

@ -191,7 +191,7 @@ public abstract class AbstractNativePrintSettingPane extends JPanel {
JPanel layoutSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(inheritPageLayoutSettingCheck, layoutSettingPane, true); JPanel layoutSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(inheritPageLayoutSettingCheck, layoutSettingPane, true);
// 页码标签 // 页码标签
UILabel printAreaLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Page_Number"), ":")); UILabel printAreaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Page_Number") + ":");
JPanel printAreaLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel printAreaLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
printAreaLabelPane.add(printAreaLabel, BorderLayout.NORTH); printAreaLabelPane.add(printAreaLabel, BorderLayout.NORTH);
printAreaLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); printAreaLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
@ -213,13 +213,13 @@ public abstract class AbstractNativePrintSettingPane extends JPanel {
double[] rowSize = {p, p, p, p, p, p, p}; double[] rowSize = {p, p, p, p, p, p, p};
double[] columnSize = {60, p}; double[] columnSize = {60, p};
Component[][] components = { Component[][] components = {
{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer"), ":")), printerPane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer") + ":"), printerPane},
{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Copy_Number"), ":")), copyPane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Copy_Number") + ":"), copyPane},
{printAreaLabelPane, getPrintAreaPane()}, {printAreaLabelPane, getPrintAreaPane()},
{getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paper"), ":")), paperSettingCheckPane}, {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paper") + ":"), paperSettingCheckPane},
{getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"), ":")), layoutSettingCheckPane}, {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout") + ":"), layoutSettingCheckPane},
{getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin"), ":")), pageMarginCheckPane}, {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin") + ":"), pageMarginCheckPane},
{getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce"), ":")), scaleCheckPane}, {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce") + ":"), scaleCheckPane},
}; };
return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15); return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15);
} }

2
designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java
Unescape View File

@ -60,7 +60,7 @@ public class NoClientPrintSettingPane extends JPanel {
double[] rowSize = {p}; double[] rowSize = {p};
double[] columnSize = {60, p}; double[] columnSize = {60, p};
Component[][] components = { Component[][] components = {
{getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin"), ":")), pageMarginCheckPane} {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin") + ":"), pageMarginCheckPane}
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15);

2
designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java
Unescape View File

@ -187,7 +187,7 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
} }
csjConfigComboBox = new UIComboBox(configTypes.toArray()); csjConfigComboBox = new UIComboBox(configTypes.toArray());
JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type"), ":")), csjConfigComboBox}, JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), csjConfigComboBox},
FlowLayout.LEADING, 10); FlowLayout.LEADING, 10);
typePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type")))); typePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))));
this.add(typePane, BorderLayout.NORTH); this.add(typePane, BorderLayout.NORTH);

Write Preview
Loading…
Cancel
Save