Merge pull request #14322 in DESIGN/design from bugfix/11.0 to feature/x

* commit '96e00b0c1eded16e66090a0fbfad0647d1e187d0':
  REPORT-125641 fix:设计器显示问题-英语显示不全
  REPORT-128068 fix:设计器按钮显示不全且无tooltips

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -12,6 +12,7 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.ActionLabel;
 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.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -69,7 +70,6 @@ public class UpdateMainDialog extends UIDialog {
     public static final Dimension DEFAULT = new Dimension(660, 620);
 
     private static final Dimension PROGRESSBAR = new Dimension(120, 15);
-    private static final Dimension UPDATE_BUTTON = new Dimension(80, 24);
     private static final int UPDATE_PANE_ROW_SIZE = 30;
     private static final int UPDATE_CONTENT_PANE_ROW_SIZE = 10;
     private static final int UPDATE_CONTENT_PANE_COLUMN_SIZE = 10;
@@ -295,7 +295,7 @@ public class UpdateMainDialog extends UIDialog {
         loadingLabel = new LoadingLabel();
         loadingLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Checking_Jar_Update"));
         updateButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Update"));
-        updateButton.setPreferredSize(UPDATE_BUTTON);
+        updateButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton"));
         updateButton.setEnabled(false);
 
         double[] rowSize = {TableLayout.PREFERRED};

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -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.Toolkit;
 import com.fr.design.javascript.JavaScriptActionPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
@@ -291,8 +292,9 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
         cr.setForeground(UIConstants.NORMAL_BACKGROUND);
         JScrollPane jp = new JScrollPane(conditionsTree);
         addComponent(conditionPane, jp);
-
-        UIButton addSubmitConditionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Condition"));
+        String submitCondition = Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Condition");
+        UIButton addSubmitConditionButton = new UIButton(submitCondition);
+        addSubmitConditionButton.setToolTipText(submitCondition);
         addSubmitConditionButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {

designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@@ -29,3 +29,4 @@ com.fr.design.formula.FormulaPane=900*600
 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

designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@@ -28,3 +28,4 @@ com.fr.design.formula.FormulaPane=900*600
 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

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -28,3 +28,4 @@ com.fr.design.formula.FormulaPane=900*600
 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

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties

@@ -28,3 +28,4 @@ com.fr.design.formula.FormulaPane=900*600
 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

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

@@ -27,3 +27,4 @@ com.fr.design.formula.FormulaPane=900*600
 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