From afdba1310065c56d3c9ea978773b15d37127f922 Mon Sep 17 00:00:00 2001 From: lixing Date: Tue, 30 Jan 2024 16:43:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-114115=20=E6=8E=A7=E4=BB=B6=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E6=A0=B7=E5=BC=8F=E2=80=94=E6=96=B0=E5=BB=BA=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E8=81=94=E6=8E=92=E6=8C=89=E9=92=AE=E3=80=81?= =?UTF-8?q?=E5=9B=BE=E6=96=87=E6=8C=89=E9=92=AE=E6=8E=92=E5=B8=83=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E9=BB=98=E8=AE=A4=E8=A6=81=E9=80=89"=E7=AD=89?= =?UTF-8?q?=E5=88=86=E5=B8=83=E5=B1=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/mobile/ui/radiogroup/CapsuleCustomDefinePane.java | 2 +- .../mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java | 2 +- .../mainframe/mobile/ui/radiogroup/UnitedCustomDefinePane.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/CapsuleCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/CapsuleCustomDefinePane.java index 1d6987526..6bc3821b0 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/CapsuleCustomDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/CapsuleCustomDefinePane.java @@ -183,7 +183,7 @@ public class CapsuleCustomDefinePane extends MobileStyleCustomDefinePane { * 初始化固定列数面板 */ private void initColumnSizePane() { - UILabel columnSizeLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Layout_Fixed_Number")); + UILabel columnSizeLabel = DesignerUtils.createConfigLabel(""); columnSizeSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, DesignerUtils.INITIAL_COLUMN_SIZE); columnSizeSpinner.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20)); columnSizePane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{columnSizeLabel, columnSizeSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java index 0284f28c5..c4f5ad4a3 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java @@ -157,8 +157,8 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane { private void initButtonAlignPane() { UILabel buttonAlignLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment")); buttonAlignCombo = new UIComboBox(new String[]{ - Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"), Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"), + Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"), }); buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20)); buttonAlignPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{buttonAlignLabel, buttonAlignCombo}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/UnitedCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/UnitedCustomDefinePane.java index 7d39b2ad0..7280d1696 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/UnitedCustomDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/UnitedCustomDefinePane.java @@ -143,8 +143,8 @@ public class UnitedCustomDefinePane extends MobileStyleCustomDefinePane { JPanel hPaddingSpinnerPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{leftSpinnerPanel, rightSpinnerPanel}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, LayoutConstants.VGAP_SMALL); // 按钮排布下拉框 buttonAlignCombo = new UIComboBox(new String[]{ - Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"), Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"), + Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"), }); buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.NORMAL_COMBO_WIDTH, 20)); double p = TableLayout.PREFERRED; From 3cdb066aad0e9882543995b0d775283e47a9829f Mon Sep 17 00:00:00 2001 From: lixing Date: Tue, 30 Jan 2024 16:44:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-114070=20=E6=8E=A7=E4=BB=B6=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E6=A0=B7=E5=BC=8F=E2=80=94=E5=B8=83=E5=B1=80=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=9B=BA=E5=AE=9A=E5=88=97=E6=95=B0=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=8F=AA=E6=94=AF=E6=8C=81=E6=AD=A3=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java index c4f5ad4a3..ee990459a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java @@ -168,8 +168,8 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane { * 初始化固定列数面板 */ private void initColumnSizePane() { - UILabel columnSizeLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Layout_Fixed_Number")); - columnSizeSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, DesignerUtils.INITIAL_COLUMN_SIZE); + UILabel columnSizeLabel = DesignerUtils.createConfigLabel(""); + columnSizeSpinner = new UISpinner(1, Integer.MAX_VALUE, 1, DesignerUtils.INITIAL_COLUMN_SIZE); columnSizeSpinner.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20)); columnSizePane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{columnSizeLabel, columnSizeSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL); columnSizePane.setVisible(false); From 266b9b48ab341477f62ef6439411a3e46c63328f Mon Sep 17 00:00:00 2001 From: lixing Date: Tue, 30 Jan 2024 16:44:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-114161=20=E6=8E=A7=E4=BB=B6=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E6=A0=B7=E5=BC=8F=E2=80=94=E5=9B=BE=E6=96=87=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=96=B0=E5=A2=9E=E7=9A=84=E5=9B=BE=E6=A0=87=E6=A0=BC?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/mobile/ui/radiogroup/IconConfigPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/IconConfigPane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/IconConfigPane.java index 17d995d3c..85f4f3601 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/IconConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/IconConfigPane.java @@ -74,6 +74,8 @@ public class IconConfigPane extends JPanel { public void addCount() { deleteCountButton.setEnabled(true); IconButton iconButton = new IconButton(""); + selectIconButton = iconButton; + editIconButton.setEnabled(true); iconButtons.add(iconButton); int indexToInsert = northPane.getComponentCount() - 2; deleteCountButton.setEnabled(!iconButtons.isEmpty());