From ddbf5f52b79077986cb5c99d1d7fd982585745df Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 27 Dec 2023 16:35:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-111740=20=E3=80=90=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA=E3=80=91=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8D=87=E7=BA=A7=E5=90=8E=EF=BC=8C=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E9=80=82=E9=85=8D=E6=B7=B1=E6=B5=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/webattr/EditToolBar.java | 8 +++++--- .../main/java/com/fr/design/webattr/FToolBar.java | 13 +++++++------ .../java/com/fr/design/webattr/ToolBarPane.java | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java index 36222f19c9..b5ffdae96d 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java @@ -227,7 +227,7 @@ public class EditToolBar extends BasicPane { this.defaultCheckBox.setSelected(ftoolbar.isDefault() ? true : false); if (bgColorButtonGroup != null) { - this.bgColorButtonGroup.setSelectedIndex(ftoolbar.isBgColorLight() ? 0 : 1); + this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColor()); } } @@ -263,7 +263,7 @@ public class EditToolBar extends BasicPane { ftoolBar.setBackground(this.background); } if (bgColorButtonGroup != null) { - ftoolBar.setBgColorLight(bgColorButtonGroup.getSelectedIndex() == 0); + ftoolBar.setBgColorLight(bgColorButtonGroup.getSelectedIndex()); } return ftoolBar; } @@ -729,7 +729,9 @@ public class EditToolBar extends BasicPane { private JPanel createButtonColorGroup() { UILabel headLabel = new UILabel(Toolkit.i18nText("Fine-Design_ToolBar_Button_Color")); - String[] titles = new String[]{Toolkit.i18nText("Fine-Design_ToolBar_Button_Color_Light"), Toolkit.i18nText("Fine-Design_ToolBar_Button_Color_Dark")}; + String[] titles = new String[]{ Toolkit.i18nText("Fine-Design_ToolBar_Button_Color_Auto"), + Toolkit.i18nText("Fine-Design_ToolBar_Button_Color_Light"), + Toolkit.i18nText("Fine-Design_ToolBar_Button_Color_Dark")}; bgColorButtonGroup = new UIButtonGroup(titles) { @Override public void setSelectedIndex(int newSelectedIndex, boolean fireChanged) { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java index df697b19ac..a5aa6c2b10 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java @@ -6,13 +6,14 @@ import java.util.List; import com.fr.form.ui.ToolBar; import com.fr.form.ui.Widget; import com.fr.general.Background; +import com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants; public class FToolBar { private List buttonlist = new ArrayList(); private Background background = null; private boolean isDefault = true; - private boolean buttonBgColorLight = true; + private int buttonBgColor = WidgetThemeDisplayConstants.TOOLBAR_COLOR_AUTO; public List getButtonlist() { return buttonlist; } @@ -53,12 +54,12 @@ public class FToolBar { this.isDefault = isDefault; } - public boolean isBgColorLight() { - return buttonBgColorLight; + public int getButtonBgColor() { + return buttonBgColor; } - public void setBgColorLight(boolean bgColorLight) { - this.buttonBgColorLight = bgColorLight; + public void setBgColorLight(int buttonBgColor) { + this.buttonBgColor = buttonBgColor; } public ToolBar getToolBar() { @@ -69,7 +70,7 @@ public class FToolBar { ToolBar toolBar = new ToolBar(n); toolBar.setBackground(this.background); toolBar.setDefault(this.isDefault); - toolBar.setButtonBgColorLight(this.buttonBgColorLight); + toolBar.setButtonBgColor(this.buttonBgColor); return toolBar; } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java index 9e9d71f5e8..12cdd345a4 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java @@ -157,7 +157,7 @@ public class ToolBarPane extends BasicBeanPane { } this.getFToolBar().setBackground(toolbar.getBackground()); this.getFToolBar().setDefault(toolbar.isDefault()); - this.getFToolBar().setBgColorLight(toolbar.isButtonBgColorLight()); + this.getFToolBar().setBgColorLight(toolbar.getButtonBgColor()); setPopulateFinished(true); } From 107b885bb620efd31afc477a2ca486702ae43f8d Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 27 Dec 2023 18:41:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/webattr/EditToolBar.java | 5 +++-- .../main/java/com/fr/design/webattr/FToolBar.java | 14 +++++++------- .../java/com/fr/design/webattr/ToolBarPane.java | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java index b5ffdae96d..56798e501a 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java @@ -30,6 +30,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.widget.IconDefinePane; import com.fr.form.ui.Button; import com.fr.form.ui.CustomToolBarButton; +import com.fr.form.ui.ToolBarButtonBgColorType; import com.fr.form.ui.Widget; import com.fr.form.ui.WidgetInfoConfig; import com.fr.general.Background; @@ -227,7 +228,7 @@ public class EditToolBar extends BasicPane { this.defaultCheckBox.setSelected(ftoolbar.isDefault() ? true : false); if (bgColorButtonGroup != null) { - this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColor()); + this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColorType().getCode()); } } @@ -263,7 +264,7 @@ public class EditToolBar extends BasicPane { ftoolBar.setBackground(this.background); } if (bgColorButtonGroup != null) { - ftoolBar.setBgColorLight(bgColorButtonGroup.getSelectedIndex()); + ftoolBar.setButtonBgColorType(ToolBarButtonBgColorType.getTypeByCode(bgColorButtonGroup.getSelectedIndex())); } return ftoolBar; } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java index a5aa6c2b10..a5202b2949 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java @@ -4,16 +4,16 @@ import java.util.ArrayList; import java.util.List; import com.fr.form.ui.ToolBar; +import com.fr.form.ui.ToolBarButtonBgColorType; import com.fr.form.ui.Widget; import com.fr.general.Background; -import com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants; public class FToolBar { private List buttonlist = new ArrayList(); private Background background = null; private boolean isDefault = true; - private int buttonBgColor = WidgetThemeDisplayConstants.TOOLBAR_COLOR_AUTO; + private ToolBarButtonBgColorType buttonBgColorType = ToolBarButtonBgColorType.AUTO; public List getButtonlist() { return buttonlist; } @@ -54,12 +54,12 @@ public class FToolBar { this.isDefault = isDefault; } - public int getButtonBgColor() { - return buttonBgColor; + public ToolBarButtonBgColorType getButtonBgColorType() { + return buttonBgColorType; } - public void setBgColorLight(int buttonBgColor) { - this.buttonBgColor = buttonBgColor; + public void setButtonBgColorType(ToolBarButtonBgColorType buttonBgColorType) { + this.buttonBgColorType = buttonBgColorType; } public ToolBar getToolBar() { @@ -70,7 +70,7 @@ public class FToolBar { ToolBar toolBar = new ToolBar(n); toolBar.setBackground(this.background); toolBar.setDefault(this.isDefault); - toolBar.setButtonBgColor(this.buttonBgColor); + toolBar.setButtonBgColorType(this.buttonBgColorType); return toolBar; } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java index 12cdd345a4..8cfed87993 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java @@ -157,7 +157,7 @@ public class ToolBarPane extends BasicBeanPane { } this.getFToolBar().setBackground(toolbar.getBackground()); this.getFToolBar().setDefault(toolbar.isDefault()); - this.getFToolBar().setBgColorLight(toolbar.getButtonBgColor()); + this.getFToolBar().setButtonBgColorType(toolbar.getButtonBgColorType()); setPopulateFinished(true); } From d729ea1e50fa22f6080f2a3597f26cb82d29791a Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 27 Dec 2023 19:36:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=B9=E4=B8=8B=E5=91=BD=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E9=A2=9C=E8=89=B2=E6=B7=B1=E6=B5=85=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BD=9C=E4=B8=BA=E5=85=AC=E5=85=B1=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E4=BD=BF=E7=94=A8=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=E5=BE=80=E4=B8=8A=E6=8A=BD=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/webattr/EditToolBar.java | 4 ++-- .../src/main/java/com/fr/design/webattr/FToolBar.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java index 56798e501a..2ec213faf4 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java @@ -30,7 +30,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.widget.IconDefinePane; import com.fr.form.ui.Button; import com.fr.form.ui.CustomToolBarButton; -import com.fr.form.ui.ToolBarButtonBgColorType; +import com.fr.general.ColorMode; import com.fr.form.ui.Widget; import com.fr.form.ui.WidgetInfoConfig; import com.fr.general.Background; @@ -264,7 +264,7 @@ public class EditToolBar extends BasicPane { ftoolBar.setBackground(this.background); } if (bgColorButtonGroup != null) { - ftoolBar.setButtonBgColorType(ToolBarButtonBgColorType.getTypeByCode(bgColorButtonGroup.getSelectedIndex())); + ftoolBar.setButtonBgColorType(ColorMode.getTypeByCode(bgColorButtonGroup.getSelectedIndex())); } return ftoolBar; } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java index a5202b2949..9af8849cec 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.fr.form.ui.ToolBar; -import com.fr.form.ui.ToolBarButtonBgColorType; +import com.fr.general.ColorMode; import com.fr.form.ui.Widget; import com.fr.general.Background; @@ -13,7 +13,7 @@ public class FToolBar { private Background background = null; private boolean isDefault = true; - private ToolBarButtonBgColorType buttonBgColorType = ToolBarButtonBgColorType.AUTO; + private ColorMode buttonBgColorType = ColorMode.AUTO; public List getButtonlist() { return buttonlist; } @@ -54,11 +54,11 @@ public class FToolBar { this.isDefault = isDefault; } - public ToolBarButtonBgColorType getButtonBgColorType() { + public ColorMode getButtonBgColorType() { return buttonBgColorType; } - public void setButtonBgColorType(ToolBarButtonBgColorType buttonBgColorType) { + public void setButtonBgColorType(ColorMode buttonBgColorType) { this.buttonBgColorType = buttonBgColorType; } From 28011b7151f5b2edd9b829682207e74ec73ed805 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 27 Dec 2023 19:40:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=E4=B9=9F?= =?UTF-8?q?=E6=94=B9=E4=B8=8B=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/webattr/EditToolBar.java | 4 ++-- .../main/java/com/fr/design/webattr/FToolBar.java | 12 ++++++------ .../main/java/com/fr/design/webattr/ToolBarPane.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java index 2ec213faf4..17d411706e 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java @@ -228,7 +228,7 @@ public class EditToolBar extends BasicPane { this.defaultCheckBox.setSelected(ftoolbar.isDefault() ? true : false); if (bgColorButtonGroup != null) { - this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColorType().getCode()); + this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColorMode().getCode()); } } @@ -264,7 +264,7 @@ public class EditToolBar extends BasicPane { ftoolBar.setBackground(this.background); } if (bgColorButtonGroup != null) { - ftoolBar.setButtonBgColorType(ColorMode.getTypeByCode(bgColorButtonGroup.getSelectedIndex())); + ftoolBar.setButtonBgColorMode(ColorMode.getModeByCode(bgColorButtonGroup.getSelectedIndex())); } return ftoolBar; } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java index 9af8849cec..d48b466f19 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java @@ -13,7 +13,7 @@ public class FToolBar { private Background background = null; private boolean isDefault = true; - private ColorMode buttonBgColorType = ColorMode.AUTO; + private ColorMode buttonBgColorMode = ColorMode.AUTO; public List getButtonlist() { return buttonlist; } @@ -54,12 +54,12 @@ public class FToolBar { this.isDefault = isDefault; } - public ColorMode getButtonBgColorType() { - return buttonBgColorType; + public ColorMode getButtonBgColorMode() { + return buttonBgColorMode; } - public void setButtonBgColorType(ColorMode buttonBgColorType) { - this.buttonBgColorType = buttonBgColorType; + public void setButtonBgColorMode(ColorMode buttonBgColorMode) { + this.buttonBgColorMode = buttonBgColorMode; } public ToolBar getToolBar() { @@ -70,7 +70,7 @@ public class FToolBar { ToolBar toolBar = new ToolBar(n); toolBar.setBackground(this.background); toolBar.setDefault(this.isDefault); - toolBar.setButtonBgColorType(this.buttonBgColorType); + toolBar.setButtonBgColorMode(this.buttonBgColorMode); return toolBar; } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java index 8cfed87993..3896125221 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java @@ -157,7 +157,7 @@ public class ToolBarPane extends BasicBeanPane { } this.getFToolBar().setBackground(toolbar.getBackground()); this.getFToolBar().setDefault(toolbar.isDefault()); - this.getFToolBar().setButtonBgColorType(toolbar.getButtonBgColorType()); + this.getFToolBar().setButtonBgColorMode(toolbar.getButtonBgColorMode()); setPopulateFinished(true); }