From 40b6475adda668f67f99da5e53e18883bf6b761c Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 13 Sep 2023 11:25:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-104056=20=E3=80=90FR=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E3=80=91=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/PreferencePane.java | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 91d67edf8d..cb120fc9ec 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/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,17 +641,24 @@ public class PreferencePane extends BasicPane { private void createEditPane(JPanel generalPane) { //samuel:编辑器设置 - JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference")); + JPanel editPane; + if(Locale.US.equals(GeneralContext.getLocale())) { + //英文文本较长，需要换行展示 + editPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference")); + } else { + editPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference")); + } generalPane.add(editPane); + JPanel formulaPane = new JPanel(); //设置是否支持将字符串编辑为公式 supportStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Report_Support_String_To_Formula")); - editPane.add(supportStringToFormulaBox); + formulaPane.add(supportStringToFormulaBox); + editPane.add(formulaPane); //是否默认转化 defaultStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Basic_Always")); - editPane.add(defaultStringToFormulaBox); //不支持转化则不能默认执行 supportStringToFormulaBox.addActionListener(new ActionListener() { @Override @@ -661,7 +670,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(); + DefaultExecutePane.add(defaultStringToFormulaBox); + DefaultExecutePane.add(keyStrokePane); + editPane.add(DefaultExecutePane); shortCutLabel.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { From fd720182865f7bbd34dfba431bf3c150b3934821 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 13 Sep 2023 11:29:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-104056=20=E6=94=B9=E4=B8=8B=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/actions/file/PreferencePane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index cb120fc9ec..9004240c99 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -672,10 +672,10 @@ public class PreferencePane extends BasicPane { keyStrokePane.add(shortCutLabel, BorderLayout.CENTER); keyStrokePane.setBorder(new EmptyBorder(0, 10,0,0)); - JPanel DefaultExecutePane = new JPanel(); - DefaultExecutePane.add(defaultStringToFormulaBox); - DefaultExecutePane.add(keyStrokePane); - editPane.add(DefaultExecutePane); + JPanel defaultExecutePane = new JPanel(); + defaultExecutePane.add(defaultStringToFormulaBox); + defaultExecutePane.add(keyStrokePane); + editPane.add(defaultExecutePane); shortCutLabel.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { From c89113e8f1c277a39334ba0b93f1b247167cce70 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 13 Sep 2023 15:07:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-104056=20=E7=BB=9F=E4=B8=80=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/actions/file/PreferencePane.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 9004240c99..3bacc62e71 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -641,13 +641,7 @@ public class PreferencePane extends BasicPane { private void createEditPane(JPanel generalPane) { //samuel:编辑器设置 - JPanel editPane; - if(Locale.US.equals(GeneralContext.getLocale())) { - //英文文本较长，需要换行展示 - editPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference")); - } else { - editPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference")); - } + JPanel editPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference")); generalPane.add(editPane); JPanel formulaPane = new JPanel(); From 7173c158bab340cecc18cf3811d7e14a1dc98284 Mon Sep 17 00:00:00 2001 From: obo Date: Sun, 17 Sep 2023 15:48:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-104056=20=E8=A1=A5=E5=85=85=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/actions/file/PreferencePane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 3bacc62e71..db7806aa8a 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -647,6 +647,7 @@ public class PreferencePane extends BasicPane { JPanel formulaPane = new JPanel(); //设置是否支持将字符串编辑为公式 supportStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Report_Support_String_To_Formula")); + //行容器为一个panel formulaPane.add(supportStringToFormulaBox); editPane.add(formulaPane); From e96700795ec43ffb8b362ef9e722aa25abefd2a0 Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 18 Sep 2023 19:16:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-104056=20=E4=BF=9D=E6=8C=81=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/actions/file/PreferencePane.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index db7806aa8a..65ed9fc171 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -644,12 +644,9 @@ public class PreferencePane extends BasicPane { JPanel editPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference")); generalPane.add(editPane); - JPanel formulaPane = new JPanel(); //设置是否支持将字符串编辑为公式 supportStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Report_Support_String_To_Formula")); - //行容器为一个panel - formulaPane.add(supportStringToFormulaBox); - editPane.add(formulaPane); + editPane.add(supportStringToFormulaBox); //是否默认转化 defaultStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Basic_Always")); @@ -667,7 +664,7 @@ public class PreferencePane extends BasicPane { keyStrokePane.add(shortCutLabel, BorderLayout.CENTER); keyStrokePane.setBorder(new EmptyBorder(0, 10,0,0)); - JPanel defaultExecutePane = new JPanel(); + JPanel defaultExecutePane = new JPanel(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout()); defaultExecutePane.add(defaultStringToFormulaBox); defaultExecutePane.add(keyStrokePane); editPane.add(defaultExecutePane);