Browse Source

REPORT-144631 使用LazyIcon适配Icon

fbp/feature
shengzu.xue 2 months ago
parent
commit
0d66014eed
  1. 0
      designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_disabled.svg
  2. 0
      designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_normal.svg
  3. 4
      designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json
  4. 3
      designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
  5. 3
      designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java
  6. 4
      designer-realize/src/main/java/com/fr/design/actions/insert/flot/AutoChartFloatAction.java

0
designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg → designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_disabled.svg

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg → designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_normal.svg

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

4
designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json

@ -511,6 +511,10 @@
"normal": "alphafine/alphaFine_template.svg",
"disable": "alphafine/alphaFine_template_disable.svg",
"white": "alphafine/alphaFine_template_white.svg"
},
"auto_chart": {
"normal": "insert/auto_chart_normal.svg",
"disable": "insert/auto_chart_disabled.svg"
}
}
}

3
designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java

@ -1,5 +1,6 @@
package com.fr.van.chart.designer.type;
import com.fine.theme.icon.LazyIcon;
import com.fr.base.BaseUtils;
import com.fr.base.chart.chartdata.TopDefinitionProvider;
import com.fr.base.svg.IconUtils;
@ -62,7 +63,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
buttonPane.setLayout(new BorderLayout());
if (ChartTypeManager.AUTO_CHART) {
autoButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Auto_Recommended_Chart"),
IconUtils.readIcon("/com/fr/design/images/m_insert/auto_chart_normal.svg")) {
new LazyIcon("auto_chart")) {
@Override
public Dimension getPreferredSize() {
return new Dimension((int) super.getPreferredSize().getWidth(), 25);

3
designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java

@ -1,5 +1,6 @@
package com.fr.design.actions.insert.cell;
import com.fine.theme.icon.LazyIcon;
import com.fr.chart.chartattr.AutoChartCollection;
import com.fr.common.annotations.Open;
import com.fr.design.actions.core.WorkBookSupportable;
@ -30,7 +31,7 @@ public class AutoChartCellAction extends AbstractCellAction implements WorkBookS
this.setMenuKeySet(INSERT_AUTO_CHART);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_insert/auto_chart_normal.svg");
this.setSmallIcon(new LazyIcon("auto_chart"));
}
public static final MenuKeySet INSERT_AUTO_CHART = new MenuKeySet() {

4
designer-realize/src/main/java/com/fr/design/actions/insert/flot/AutoChartFloatAction.java

@ -1,6 +1,6 @@
package com.fr.design.actions.insert.flot;
import com.fr.base.BaseUtils;
import com.fine.theme.icon.LazyIcon;
import com.fr.design.gui.chart.MiddleChartDialog;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.ElementCasePane;
@ -28,7 +28,7 @@ public class AutoChartFloatAction extends ChartFloatAction {
this.setMenuKeySet(FLOAT_INSERT_AUTO_CHART);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon("/com/fr/design/images/m_insert/auto_chart_normal.svg");
this.setSmallIcon(new LazyIcon("auto_chart"));
}
public static final MenuKeySet FLOAT_INSERT_AUTO_CHART = new MenuKeySet() {

Loading…
Cancel
Save