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

通过dimension修改国际化问题

feature/ru^2
zack 4 weeks ago
parent
5758a820bf
commit
bc6024ce74
14 changed files with 267 additions and 199 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java
  2. 3
      designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java
  3. 5
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  4. 5
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  5. 3
      designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java
  6. 10
      designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
  7. 10
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
  8. 10
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
  9. 10
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties
  10. 10
      designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
  11. 10
      designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
  12. 3
      designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
  13. 7
      designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java
  14. 3
      designer-realize/src/main/java/com/fr/design/report/WordExportPane.java

3
designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java
Unescape View File

@ -10,6 +10,7 @@ import com.fr.design.editor.editor.IntegerEditor;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
@ -74,7 +75,7 @@ public class DBCPAttrPane extends BasicPane {
// JPanel northFlowPane
northFlowPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
northFlowPane.setPreferredSize(new Dimension(630, 430));
northFlowPane.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane"));
defaultPane.add(northFlowPane, BorderLayout.NORTH);
// ContextPane

3
designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java
Unescape View File

@ -8,6 +8,7 @@ import com.fr.design.write.submit.DBManipulationPane;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.javascript.Commit2DBJavaScriptPane;
import com.fr.general.ComparatorUtils;
import com.fr.stable.StringUtils;
import javax.swing.*;
@ -217,7 +218,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous
while (true) {
//从提交1开始
count = count == 0 ? 1 : count;
String newName = prefix + " " + count;
String newName = prefix + StringUtils.BLANK + count;
boolean repeated = false;
for (int i= 0;i < getTabCount();i++) {
if (ComparatorUtils.equals( ((DBManipulationPane)dbManipulationPaneList.get(i)).getSubMitName(), newName)) {

5
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
Unescape View File

@ -29,6 +29,7 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.imenu.UIMenuHighLight;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.gui.itoolbar.UIToolbar;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
@ -712,7 +713,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
// 确认按钮
confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Confirm"));
confirmButton.setPreferredSize(new Dimension(65, 25));
confirmButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton"));
confirmButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@ -723,7 +724,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
// 取消按钮
UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));
cancelButton.setPreferredSize(new Dimension(65, 25));
cancelButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton"));
cancelButton.addActionListener(new ActionListener() {

5
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
Unescape View File

@ -28,6 +28,7 @@ import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ilist.CheckBoxList;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.i18n.Toolkit;
import com.fr.design.javascript.JavaScriptActionPane;
import com.fr.design.layout.FRGUIPaneFactory;
@ -201,7 +202,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
String updateCheckBoxName = Toolkit.i18nText("Fine-Design_Basic_RWA_NotChange_Unmodified");
UpdateCheckBox = new UICheckBox(updateCheckBoxName);
UpdateCheckBox.setToolTipText(updateCheckBoxName);
UpdateCheckBox.setPreferredSize(new Dimension(180, 20));
UpdateCheckBox.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox"));
UIButton helpButton = new UIButton(HEIP_ICON);
helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"));
helpButton.setPreferredSize(new Dimension(20, 20));
@ -350,7 +351,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
}
protected Dimension createControlBtnPanePreferredSize() {
return new Dimension(110, 0);
return new Dimension(110, 20);
}
protected String setControlBtnPanePosition() {

3
designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java vendored
Unescape View File

@ -11,6 +11,7 @@ import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIButtonUI;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext;
@ -171,7 +172,7 @@ public class EnvDetectorDialog extends JDialog {
stopDetecting(detectButton);
}
});
` detectButton.setPreferredSize(new Dimension(89, 30));
detectButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton"));
detectButton.setBorderPainted(false);
detectButton.setContentAreaFilled(false);
headerPanel.add(detectButton, BorderLayout.WEST);

10
designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
Unescape View File

@ -30,3 +30,13 @@ com.fr.design.formula.FormulaPaneWhenReserveFormula=1200*600
com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=130*20
com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=140*20
com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=100*24
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20
com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330
com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20
com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20
com.fr.design.report.WordExportPane.outNorthPane=580*110
com.fr.design.report.ReportColumnsPane.labelButton=60*20
com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80
com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24
com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20

10
designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
Unescape View File

@ -29,3 +29,13 @@ com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600
com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=100*20
com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=130*20
com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=160*24
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20
com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330
com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20
com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20
com.fr.design.report.WordExportPane.outNorthPane=580*110
com.fr.design.report.ReportColumnsPane.labelButton=60*20
com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80
com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24
com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20

10
designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
Unescape View File

@ -29,3 +29,13 @@ com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600
com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20
com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20
com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20
com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330
com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20
com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20
com.fr.design.report.WordExportPane.outNorthPane=580*110
com.fr.design.report.ReportColumnsPane.labelButton=60*20
com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80
com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24
com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20

10
designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties
Unescape View File

@ -30,3 +30,13 @@ com.fr.design.formula.FormulaPaneWhenReserveFormula=1200*600
com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=130*20
com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=140*20
com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=100*24
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=65*20
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=65*20
com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*430
com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*25
com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=89*30
com.fr.design.report.WordExportPane.outNorthPane=700*120
com.fr.design.report.ReportColumnsPane.labelButton=80*20
com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*100
com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=147*24
com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=180*20

10
designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
Unescape View File

@ -29,3 +29,13 @@ com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600
com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20
com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20
com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20
com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330
com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20
com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20
com.fr.design.report.WordExportPane.outNorthPane=580*110
com.fr.design.report.ReportColumnsPane.labelButton=60*20
com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80
com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24
com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20

10
designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
Unescape View File

@ -28,3 +28,13 @@ com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600
com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20
com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20
com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20
com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20
com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330
com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20
com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20
com.fr.design.report.WordExportPane.outNorthPane=580*110
com.fr.design.report.ReportColumnsPane.labelButton=60*20
com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80
com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24
com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20

3
designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
Unescape View File

@ -9,6 +9,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.theme.utils.DefaultThemedTemplateCellElementCase;
@ -54,7 +55,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
private static final int NEW_VALUE = 4;
//新值下面的编辑器的宽度
private static final int NEW_PANE_WIDTH = 120;
private static final Dimension VALUEPANE_NEW_DIMENSION = new Dimension(154,25);
private static final Dimension VALUEPANE_NEW_DIMENSION = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane");
private static final Dimension VALUEPANE_OLD_DIMENSION = new Dimension(0,0);

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

@ -11,6 +11,7 @@ import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.DesignUtils;
import com.fr.design.utils.gui.GUICoreUtils;
@ -101,7 +102,7 @@ public class ReportColumnsPane extends BasicPane{
@Override
protected void initButton(UIToggleButton labelButton) {
labelButton.setSize(new Dimension(60,20));
labelButton.setPreferredSize(new Dimension(80, 20));
labelButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.ReportColumnsPane.labelButton"));
super.initButton(labelButton);
}
};
@ -309,10 +310,10 @@ public class ReportColumnsPane extends BasicPane{
UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Area"));
rowPane.setBorder(explainBorder);
rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13));
rowPane.setPreferredSize(new Dimension(500,100));
rowPane.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.ReportColumnsPane.createRowPane.rowPane"));
rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Data") + ":"));
repeatColDataTextField = new UITextField();
repeatColDataTextField.setPreferredSize(new Dimension(147,24));
repeatColDataTextField.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField"));
rowPane.add(repeatColDataTextField);
rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 "));
copyLabel = new UILabel(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":");

3
designer-realize/src/main/java/com/fr/design/report/WordExportPane.java
Unescape View File

@ -9,6 +9,7 @@ import com.fr.design.gui.ilable.ActionLabel;
import com.fr.design.gui.ilable.MultilineLabel;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.io.attr.WordExportAttr;
@ -47,7 +48,7 @@ public class WordExportPane extends BasicPane {
this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
JPanel outPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane("Word" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export"));
JPanel outNorthPane =FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Export_Setting"));
outNorthPane.setPreferredSize(new Dimension(700, 120));
outNorthPane.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.WordExportPane.outNorthPane"));
this.add(outPane);
outPane.add(outNorthPane);

Write Preview
Loading…
Cancel
Save