Browse Source

Pull request #2925: REPORT-43516 【视觉优化】页面设置与重复与冻结设置图标优化

Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0

* commit '8c462edfddfe614315ad84f4a450d42d8c34a0b9':
  REPORT-43516 【视觉优化】页面设置与重复与冻结设置图标优化 【问题原因】页面设置和重复与冻结设置的图标重复了 【改动方案】更换重复与冻结设置的图标
feature/big-screen
Yvan 4 years ago
parent
commit
6eaa9fa3e6
  1. BIN
      designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen.png
  2. 4
      designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java
  3. 1
      designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

BIN
designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 233 B

4
designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java

@ -27,7 +27,7 @@ public class ReportPageAttrAction extends ReportComponentAction<WorkSheetDesigne
this.setMenuKeySet(KeySetUtils.REPORT_PAGE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_file/pageSetup.png"));
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_file/repeatAndFrozen.png"));
this.generateAndSetSearchText(RepeatAndFreezeSettingPane.class.getName());
}
@ -58,4 +58,4 @@ public class ReportPageAttrAction extends ReportComponentAction<WorkSheetDesigne
dlg.setVisible(true);
return returnValue;
}
}
}

1
designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

@ -317,6 +317,7 @@ public class ImagePreLoader {
"com/fr/web/images/print.png",
"com/fr/design/images/m_report/watermark.png",
"com/fr/design/images/m_file/pageSetup.png",
"com/fr/design/images/m_file/repeatAndFrozen.png",
"com/fr/design/images/m_report/header.png",
"com/fr/design/images/m_report/footer.png",
"com/fr/design/images/m_report/background.png",

Loading…
Cancel
Save