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

* commit 'a42fcdd3a916800134ed37d2dd5813f411a355d9':
  REPORT-104056 保持整体对齐
  REPORT-104056 补充一下注释
  REPORT-104056 统一布局
  REPORT-104056 改下命名
  REPORT-104056 【FR国际化】文字显示不全

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -44,6 +44,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
+import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.general.log.Log4jConfig;
@@ -75,6 +76,7 @@ import javax.swing.ButtonGroup;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
@@ -248,7 +250,7 @@ public class PreferencePane extends BasicPane {
     private JProgressBar gcProgressBar;
     private Timer gcProgressTimer;
     private UIButton gcOkButton = new UIButton(i18nText("Fine-Design_Report_OK"));
-    
+
     private UIRadioButton previewResolutionBtnS;
     private UIRadioButton previewResolutionBtnM;
 
@@ -278,7 +280,7 @@ public class PreferencePane extends BasicPane {
         JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         UIScrollPane generalScrollPane = patchScroll(generalPane);
         jtabPane.addTab(i18nText("Fine-Design_Basic_General"), generalScrollPane);
-        
+
         JPanel advancePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         UIScrollPane adviceScrollPane = patchScroll(advancePane);
         jtabPane.addTab(i18nText("Fine-Design_Basic_Advanced"), adviceScrollPane);
@@ -293,7 +295,7 @@ public class PreferencePane extends BasicPane {
         //配置面板作为vcs总面板的一张卡片
         vcsParentPane.add(vcsScrollPane, VcsMovePanel.SETTING);
         jtabPane.addTab(i18nText("Fine-Design_Vcs_Title"), vcsParentPane);
-        
+
         contentPane.add(jtabPane, BorderLayout.NORTH);
 
         createFunctionPane(generalPane);
@@ -310,7 +312,7 @@ public class PreferencePane extends BasicPane {
         createLogPane(advancePane);
 
         createLanPane(generalPane);
-        
+
         createStartupPagePane(generalPane);
 
         createLengthPane(advancePane);
@@ -376,7 +378,7 @@ public class PreferencePane extends BasicPane {
         designerStartupOption.add(cloudAnalyticsDelayCheckBox);
         advancePane.add(designerStartupOption);
     }
-    
+
     private JPanel createImageExportSettingPane() {
         previewResolutionBtnS = new UIRadioButton(i18nText("Fine-Design_Image_Export_SD"), true);
         previewResolutionBtnM = new UIRadioButton(i18nText("Fine-Design_Image_Export_HD"));
@@ -412,7 +414,7 @@ public class PreferencePane extends BasicPane {
         generalPanelWithScroll.setPreferredSize(new Dimension(generalPane.getWidth(), 600));
         return generalPanelWithScroll;
     }
-    
+
     private void createVcsSettingPane(JPanel generalPane,JPanel parentPane, CardLayout cardLayout) {
         //迁移面板
         movePanel = createMovePane(cardLayout, parentPane);
@@ -639,7 +641,7 @@ public class PreferencePane extends BasicPane {
 
     private void createEditPane(JPanel generalPane) {
         //samuel:编辑器设置
-        JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference"));
+        JPanel editPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference"));
         generalPane.add(editPane);
 
         //设置是否支持将字符串编辑为公式
@@ -649,7 +651,6 @@ public class PreferencePane extends BasicPane {
         //是否默认转化
         defaultStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Basic_Always"));
 
-        editPane.add(defaultStringToFormulaBox);
         //不支持转化则不能默认执行
         supportStringToFormulaBox.addActionListener(new ActionListener() {
             @Override
@@ -661,7 +662,12 @@ public class PreferencePane extends BasicPane {
         keyStrokePane.add(new UILabel(i18nText("Fine-Design_Basic_Support_Auto_Complete_Shortcut") + ":"), BorderLayout.WEST);
         shortCutLabel = new UILabel();
         keyStrokePane.add(shortCutLabel, BorderLayout.CENTER);
-        editPane.add(keyStrokePane);
+        keyStrokePane.setBorder(new EmptyBorder(0, 10,0,0));
+
+        JPanel defaultExecutePane = new JPanel(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout());
+        defaultExecutePane.add(defaultStringToFormulaBox);
+        defaultExecutePane.add(keyStrokePane);
+        editPane.add(defaultExecutePane);
         shortCutLabel.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {