Browse Source

Pull request #7376: CHART-22503 标题、图例、轴标题、轴标签、数据表等字符颜色控件-多余增加了自动

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

* commit '9da19ba5f9ed592db4cbeb4ca877503e168ebd14':
  CHART-22503 标题、图例、轴标题、轴标签、数据表等字符颜色控件-多余增加了自动
bugfix/11.0
fanglei 3 years ago
parent
commit
f86ae15a58
  1. 7
      designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java
  2. 7
      designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java

7
designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java

@ -7,7 +7,6 @@ import com.fr.design.constants.LayoutConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.event.UIObserverListener;
import com.fr.design.gui.ibutton.UIColorButton;
import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
import com.fr.design.gui.ibutton.UIToggleButton;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
@ -57,7 +56,11 @@ public class ChartFontPane extends BasicPane {
fontSizeComboBox = new UIComboBox(FONT_SIZES);
bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
fontColor = new UIColorButtonWithAuto();
fontColor = getColorButton();
}
protected UIColorButton getColorButton() {
return new UIColorButton();
}
protected void initComponents() {

7
designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartLabelStylePane.java

@ -2,6 +2,8 @@ package com.fr.design.mainframe.theme.edit.chart;
import com.fr.base.theme.settings.ThemedChartStyle;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.ibutton.UIColorButton;
import com.fr.design.gui.ibutton.UIColorButtonWithAuto;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
@ -25,6 +27,11 @@ public class ChartLabelStylePane extends AbstractChartStylePane {
autoButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),
Toolkit.i18nText("Fine-Design_Chart_Custom")});
chartFontPane = new ChartFontPane() {
@Override
protected UIColorButton getColorButton() {
return new UIColorButtonWithAuto();
}
public String getUILabelText() {
return Toolkit.i18nText("Fine-Design_Chart_Label_Character");
}

Loading…
Cancel
Save