Pull request #7652: CHART-22545&REPORT-65553 甘特图标签日期下拉框宽度设置不正确&背景国际化未设置

Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0

* commit 'dbd5cd66491a32c96375a64092491a991f9cea7a':
  REPORT-65373 JDK11设计器-菜单栏-文件-选项弹窗边框被截断
  CHART-22545 设计器语言英语-甘特图-标签格式-控件宽度不一致

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

@@ -108,7 +108,7 @@ public class PreferencePane extends BasicPane {
     private static final int CACHING_DEFAULT = 5;
     private static final int CACHING_GAP = 5;
     private static final int MEMORY_TIP_LABEL_MAX_WIDTH = 230;
-    private static final int OFFSET_HEIGHT = 50;
+    private static final int OFFSET_HEIGHT = 60;
 
     private static final String TYPE = "pressed";
     private static final String DISPLAY_TYPE = "+";

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartFormatComBoxWithCheckBox.java

@@ -53,7 +53,7 @@ public class VanChartFormatComBoxWithCheckBox extends JPanel {
 
             }
         });
-        formatComBox.setPreferredSize(new Dimension(40, 20));
+        formatComBox.setPreferredSize(new Dimension(55, 20));
 
         if (showSelectBox()) {
             this.add(isSelectedBox, BorderLayout.CENTER);

designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java

@@ -2,7 +2,6 @@ package com.fr.design.report;
 
 import com.fr.base.theme.ReportTheme;
 import com.fr.base.theme.TemplateTheme;
-import com.fr.base.theme.settings.ThemedComponentStyle;
 import com.fr.base.theme.settings.ThemedReportBodyStyle;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
@@ -10,21 +9,19 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.style.ReportBackgroundSpecialPane;
 import com.fr.design.gui.style.FollowingThemePane;
+import com.fr.design.gui.style.ReportBackgroundSpecialPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.theme.ui.BorderUtils;
-import com.fr.form.ui.PaddingMargin;
 import com.fr.general.Background;
 import com.fr.page.ReportSettingsProvider;
 import com.fr.report.stable.ReportSettings;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 import javax.swing.border.CompoundBorder;
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -168,7 +165,7 @@ public class NewReportBackgroundPane extends BasicPane {
             container.setBorder(BorderFactory.createEmptyBorder());
             JPanel titledPane =  FRGUIPaneFactory.createBorderLayout_S_Pane();
             titledPane.setBorder(new CompoundBorder(
-                    BorderUtils.createTitleBorder("预览", 12),
+                    BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Preview"), 12),
                     BorderFactory.createEmptyBorder(5, 5, 4, 5)
             ));
             titledPane.setPreferredSize(new Dimension(377, 502));