fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化 

No.6 :替换了决策报表-工具栏，以及普通报表 && 聚合报表，编辑参数面板时的工具栏图标
research/11.0
Yvan 4 years ago
parent
5f31ca615f
commit
21333e5612
23 changed files with 170 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java
  2. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/absolute_layout_normal.svg
  3. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16_normal.svg
  4. 10
      designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16_normal.svg
  5. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16_normal.svg
  6. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg
  7. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg
  8. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg
  9. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg
  10. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_tree_16_normal.svg
  11. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg
  12. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16_normal.svg
  13. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16_normal.svg
  14. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg
  15. 8
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg
  16. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg
  17. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg
  18. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16_normal.svg
  19. 4
      designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java
  20. 9
      designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java
  21. 3
      designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
  22. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java
  23. 15
      designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

29
designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.design.gui.core;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIcon;
import com.fr.form.ui.*;
import com.fr.general.ComparatorUtils;
@ -127,27 +128,27 @@ public abstract class WidgetOption implements Serializable {
}
public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"),
SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/date_16_normal.svg"),
DateEditor.class);
public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16.png"), TreeEditor.class);
SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/tree_16_normal.svg"), TreeEditor.class);
public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"),
public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/combo_box_tree_16_normal.svg"),
TreeComboBoxEditor.class);
public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class);
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg"), CheckBoxGroup.class);
public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg"),
RadioGroup.class);
public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class);
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg"), NumberEditor.class);
public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/label_16_normal.svg"),
Label.class);
public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass(
@ -155,7 +156,7 @@ public abstract class WidgetOption implements Serializable {
Button.class);
public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/button_16_normal.svg"),
FreeButton.class);
public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(
@ -163,15 +164,15 @@ public abstract class WidgetOption implements Serializable {
MultiFileEditor.class);
public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg"),
ComboBox.class);
public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg"),
ComboCheckBox.class);
public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg"),
CheckBox.class);
public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass(
@ -181,16 +182,16 @@ public abstract class WidgetOption implements Serializable {
public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Text")
, BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16.png"),
, SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg"),
TextEditor.class);
public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg"),
TextArea.class);
public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class);
SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg"), Password.class);
public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
IframeEditor.class);

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/absolute_layout_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_绝对画薄块_normal</title>
<g id="icon_绝对画薄块_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M15,1 L15,15 L1,15 L1,1 L15,1 Z M14,8 L1.999,8 L2,14 L14,14 L14,8 Z M14,2 L2,2 L1.999,7 L9,7 L9,2 L10,2 L10,7 L14,7 L14,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 555 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_tab块_normal</title>
<g id="icon_tab块_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M7,1 L7,2 L15,2 L15,15 L1,15 L1,1 L7,1 Z M6,2 L2,2 L2,14 L14,14 L14,7 L6,7 L6,2 Z M12,11 L12,12 L4,12 L4,11 L12,11 Z M12,9 L12,10 L4,10 L4,9 L12,9 Z M10,3 L7,3 L7,6 L10,6 L10,3 Z M14,3 L11,3 L11,6 L14,6 L14,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 624 B

10
designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16_normal.svg
Unescape View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_报表块_normal</title>
<g id="icon_报表块_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<rect id="Rectangle-76" fill="#41C9FD" opacity="0.3" x="2" y="2" width="12" height="4"></rect>
<path d="M15,1 L15,15 L1,15 L1,1 L15,1 Z M14,2 L2,2 L2,14 L14,14 L14,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
<rect id="Rectangle-75" fill="#333334" x="2" y="6" width="12" height="1"></rect>
<rect id="Rectangle" fill="#333334" x="5" y="2" width="1" height="12"></rect>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 761 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_按钮_normal</title>
<g id="icon_控件_按钮_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M1,4 L1,10 L15,10 L15,4 L1,4 Z M16,12 L16,13 L1,13 L1,12 L16,12 Z M16,3 L16,11 L0,11 L0,3 L16,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 525 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_单选框组_normal</title>
<g id="icon_控件_单选框组_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M3.5,9 C5.43299662,9 7,10.5670034 7,12.5 C7,14.4329966 5.43299662,16 3.5,16 C1.56700338,16 0,14.4329966 0,12.5 C0,10.5670034 1.56700338,9 3.5,9 Z M3.5,10 C2.11928813,10 1,11.1192881 1,12.5 C1,13.8807119 2.11928813,15 3.5,15 C4.88071187,15 6,13.8807119 6,12.5 C6,11.1192881 4.88071187,10 3.5,10 Z M3.5,11 C4.32842712,11 5,11.6715729 5,12.5 C5,13.3284271 4.32842712,14 3.5,14 C2.67157288,14 2,13.3284271 2,12.5 C2,11.6715729 2.67157288,11 3.5,11 Z M14.5,12 C14.7761424,12 15,12.2238576 15,12.5 C15,12.7761424 14.7761424,13 14.5,13 L8.5,13 C8.22385763,13 8,12.7761424 8,12.5 C8,12.2238576 8.22385763,12 8.5,12 L14.5,12 Z M3.5,0 C5.43299662,0 7,1.56700338 7,3.5 C7,5.43299662 5.43299662,7 3.5,7 C1.56700338,7 0,5.43299662 0,3.5 C0,1.56700338 1.56700338,0 3.5,0 Z M3.5,1 C2.11928813,1 1,2.11928813 1,3.5 C1,4.88071187 2.11928813,6 3.5,6 C4.88071187,6 6,4.88071187 6,3.5 C6,2.11928813 4.88071187,1 3.5,1 Z M3.5,2 C4.32842712,2 5,2.67157288 5,3.5 C5,4.32842712 4.32842712,5 3.5,5 C2.67157288,5 2,4.32842712 2,3.5 C2,2.67157288 2.67157288,2 3.5,2 Z M14.5,3 C14.7761424,3 15,3.22385763 15,3.5 C15,3.77614237 14.7761424,4 14.5,4 L8.5,4 C8.22385763,4 8,3.77614237 8,3.5 C8,3.22385763 8.22385763,3 8.5,3 L14.5,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_复选框_normal</title>
<g id="icon_控件_复选框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6,5 C6.55228475,5 7,5.44771525 7,6 L7,11 C7,11.5522847 6.55228475,12 6,12 L1,12 C0.44771525,12 0,11.5522847 0,11 L0,6 C0,5.44771525 0.44771525,5 1,5 L6,5 Z M6,6 L1,6 L1,11 L6,11 L6,6 Z M4.58397485,6.7226499 C4.73715108,6.49288556 5.04758575,6.43079862 5.2773501,6.58397485 C5.50711444,6.73715108 5.56920138,7.04758575 5.41602515,7.2773501 L5.41602515,7.2773501 L3.41602515,10.2773501 C3.24100436,10.5398813 2.86955521,10.576662 2.64644661,10.3535534 L2.64644661,10.3535534 L1.64644661,9.35355339 C1.45118446,9.15829124 1.45118446,8.84170876 1.64644661,8.64644661 C1.84170876,8.45118446 2.15829124,8.45118446 2.35355339,8.64644661 L2.35355339,8.64644661 L2.92228758,9.2151808 Z M14.5,8 C14.7761424,8 15,8.22385763 15,8.5 C15,8.77614237 14.7761424,9 14.5,9 L8.5,9 C8.22385763,9 8,8.77614237 8,8.5 C8,8.22385763 8.22385763,8 8.5,8 L14.5,8 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_复选框组_normal</title>
<g id="icon_控件_复选框组_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6,9 C6.55228475,9 7,9.44771525 7,10 L7,15 C7,15.5522847 6.55228475,16 6,16 L1,16 C0.44771525,16 -1.11022302e-16,15.5522847 -1.11022302e-16,15 L-1.11022302e-16,10 C-1.11022302e-16,9.44771525 0.44771525,9 1,9 L6,9 Z M6,10 L1,10 L1,15 L6,15 L6,10 Z M4.58397485,10.7226499 C4.73715108,10.4928856 5.04758575,10.4307986 5.2773501,10.5839749 C5.50711444,10.7371511 5.56920138,11.0475858 5.41602515,11.2773501 L5.41602515,11.2773501 L3.41602515,14.2773501 C3.24100436,14.5398813 2.86955521,14.576662 2.64644661,14.3535534 L2.64644661,14.3535534 L1.64644661,13.3535534 C1.45118446,13.1582912 1.45118446,12.8417088 1.64644661,12.6464466 C1.84170876,12.4511845 2.15829124,12.4511845 2.35355339,12.6464466 L2.35355339,12.6464466 L2.92228758,13.2151808 Z M14.5,12 C14.7761424,12 15,12.2238576 15,12.5 C15,12.7761424 14.7761424,13 14.5,13 L8.5,13 C8.22385763,13 8,12.7761424 8,12.5 C8,12.2238576 8.22385763,12 8.5,12 L14.5,12 Z M6,-1.11022302e-16 C6.55228475,-1.11022302e-16 7,0.44771525 7,1 L7,6 C7,6.55228475 6.55228475,7 6,7 L1,7 C0.44771525,7 -1.11022302e-16,6.55228475 -1.11022302e-16,6 L-1.11022302e-16,1 C-1.11022302e-16,0.44771525 0.44771525,-1.11022302e-16 1,-1.11022302e-16 L6,-1.11022302e-16 Z M6,1 L1,1 L1,6 L6,6 L6,1 Z M4.58397485,1.7226499 C4.73715108,1.49288556 5.04758575,1.43079862 5.2773501,1.58397485 C5.50711444,1.73715108 5.56920138,2.04758575 5.41602515,2.2773501 L5.41602515,2.2773501 L3.41602515,5.2773501 C3.24100436,5.53988128 2.86955521,5.57666199 2.64644661,5.35355339 L2.64644661,5.35355339 L1.64644661,4.35355339 C1.45118446,4.15829124 1.45118446,3.84170876 1.64644661,3.64644661 C1.84170876,3.45118446 2.15829124,3.45118446 2.35355339,3.64644661 L2.35355339,3.64644661 L2.92228758,4.2151808 Z M14.5,3 C14.7761424,3 15,3.22385763 15,3.5 C15,3.77614237 14.7761424,4 14.5,4 L8.5,4 C8.22385763,4 8,3.77614237 8,3.5 C8,3.22385763 8.22385763,3 8.5,3 L14.5,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_下拉框_normal</title>
<g id="icon_控件_下拉框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16,3 L16,13 L0,13 L0,3 L16,3 Z M15,4 L1,4 L1,12 L15,12 L15,4 Z M13.6,6 C13.7104569,6 13.8,6.08954305 13.8,6.2 C13.8,6.24327405 13.7859644,6.28538077 13.76,6.32 L11.16,9.78666666 C11.0937258,9.87503222 10.9683656,9.89294084 10.88,9.82666666 C10.8648389,9.81529581 10.8513708,9.8018278 10.84,9.78666666 L8.24,6.32 C8.17372583,6.23163444 8.19163444,6.10627417 8.28,6.04 C8.31461924,6.01403557 8.35672596,6 8.40000001,6 L13.6,6 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 860 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_tree_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_下拉树_normal</title>
<g id="icon_控件_下拉树_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16,0 L16,16 L0,16 L0,0 L16,0 Z M15,6 L1,6 L1,15 L15,15 L15,6 Z M13,13 L13,14 L6,14 L6,13 L13,13 Z M10.7504883,11 L10.7504883,12 L3,12 L3,11 L10.7504883,11 Z M13,9 L13,10 L6,10 L6,9 L13,9 Z M10.7504883,7 L10.7504883,8 L3,8 L3,7 L10.7504883,7 Z M15,1 L1,1 L1,5 L15,5 L15,1 Z M13.5171573,2 C13.6276142,2 13.7171573,2.08954305 13.7171573,2.2 C13.7171573,2.2530433 13.6960859,2.30391409 13.6585786,2.34142136 L12.1414214,3.85857864 C12.0633165,3.9366835 11.9366835,3.9366835 11.8585786,3.85857864 L10.3414214,2.34142136 C10.2633165,2.2633165 10.2633165,2.1366835 10.3414214,2.05857864 C10.3789286,2.02107137 10.4297994,2 10.4828427,2 L13.5171573,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_下拉复选框_normal</title>
<g id="icon_控件_下拉复选框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16,0 L16,16 L0,16 L0,0 L16,0 Z M15,6 L1,6 L1,15 L15,15 L15,6 Z M6,11 L6,14 L3,14 L3,11 L6,11 Z M5,12 L4,12 L4,13 L5,13 L5,12 Z M6,7 L6,10 L3,10 L3,7 L6,7 Z M5,8 L4,8 L4,9 L5,9 L5,8 Z M15,1 L1,1 L1,5 L15,5 L15,1 Z M13.5171573,2 C13.6276142,2 13.7171573,2.08954305 13.7171573,2.2 C13.7171573,2.2530433 13.6960859,2.30391409 13.6585786,2.34142136 L12.1414214,3.85857864 C12.0633165,3.9366835 11.9366835,3.9366835 11.8585786,3.85857864 L10.3414214,2.34142136 C10.2633165,2.2633165 10.2633165,2.1366835 10.3414214,2.05857864 C10.3789286,2.02107137 10.4297994,2 10.4828427,2 L13.5171573,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_日期_normal</title>
<g id="icon_控件_日期_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16,-2.22044605e-16 L16,16 L8.8817842e-16,16 L8.8817842e-16,-2.22044605e-16 L16,-2.22044605e-16 Z M15,4 L1,4 L1,15 L15,15 L15,4 Z M7,12 L7,14 L5,14 L5,12 L7,12 Z M4,12 L4,14 L2,14 L2,12 L4,12 Z M10,12 L10,14 L8,14 L8,12 L10,12 Z M7,9 L7,11 L5,11 L5,9 L7,9 Z M4,9 L4,11 L2,11 L2,9 L4,9 Z M10,9 L10,11 L8,11 L8,9 L10,9 Z M13,9 L13,11 L11,11 L11,9 L13,9 Z M7,6 L7,8 L5,8 L5,6 L7,6 Z M10,6 L10,8 L8,8 L8,6 L10,6 Z M13,6 L13,8 L11,8 L11,6 L13,6 Z M13,1.5 C13,1.77614237 12.7761424,2 12.5,2 L10.5,2 C10.2238576,2 10,1.77614237 10,1.5 L10,1 L6,1 L6,1.5 C6,1.77614237 5.77614237,2 5.5,2 L3.5,2 C3.22385763,2 3,1.77614237 3,1.5 L3,1 L1,1 L1,3 L15,3 L15,1 L13,1 L13,1.5 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_标签_normal</title>
<g id="icon_控件_标签_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16,3 L16,13 L0,13 L0,3 L16,3 Z M15,4 L1,4 L1,12 L15,12 L15,4 Z M6.41015625,6.53125 C6.71744945,6.53125 6.9850249,6.55664037 7.21289062,6.60742188 C7.44075635,6.65820338 7.63802,6.74479105 7.8046875,6.8671875 C7.96875082,6.98697977 8.09374957,7.14192613 8.1796875,7.33203125 C8.26562543,7.52213637 8.30859375,7.75781109 8.30859375,8.0390625 L8.30859375,11 L7.578125,11 L7.578125,10.5351562 C7.51302051,10.5794273 7.42513076,10.6412756 7.31445312,10.7207031 C7.20377549,10.8001306 7.09635469,10.863281 6.9921875,10.9101562 C6.86979105,10.9700524 6.72916746,11.0201821 6.5703125,11.0605469 C6.41145754,11.1009117 6.22526148,11.1210938 6.01171875,11.1210938 C5.61848762,11.1210938 5.28515762,10.9908867 5.01171875,10.7304688 C4.73827988,10.4700508 4.6015625,10.1380229 4.6015625,9.734375 C4.6015625,9.40364418 4.67252533,9.13606873 4.81445312,8.93164062 C4.95638092,8.72721252 5.15885285,8.56640684 5.421875,8.44921875 C5.68750133,8.33203066 6.00650855,8.25260438 6.37890625,8.2109375 C6.75130395,8.16927062 7.15103953,8.13802094 7.578125,8.1171875 L7.578125,8.00390625 C7.578125,7.83723875 7.54882842,7.6992193 7.49023438,7.58984375 C7.43164033,7.4804682 7.3476568,7.39453156 7.23828125,7.33203125 C7.13411406,7.27213512 7.00911531,7.23177094 6.86328125,7.2109375 C6.71744719,7.19010406 6.56510496,7.1796875 6.40625,7.1796875 C6.2135407,7.1796875 5.9986991,7.20507787 5.76171875,7.25585938 C5.5247384,7.30664088 5.27994918,7.38020785 5.02734375,7.4765625 L4.98828125,7.4765625 L4.98828125,6.73046875 C5.13151113,6.69140605 5.33854031,6.64843773 5.609375,6.6015625 C5.88020969,6.55468727 6.1471341,6.53125 6.41015625,6.53125 Z M10.4570312,4.921875 L10.4570312,7.09375 C10.6627614,6.92447832 10.8815093,6.78580783 11.1132812,6.67773438 C11.3450532,6.56966092 11.6054673,6.515625 11.8945312,6.515625 C12.4101588,6.515625 12.8170558,6.71353969 13.1152344,7.109375 C13.4134129,7.50521031 13.5625,8.06379848 13.5625,8.78515625 C13.5625,9.14974141 13.5110682,9.47786312 13.4082031,9.76953125 C13.305338,10.0611994 13.1666675,10.3059886 12.9921875,10.5039062 C12.8072907,10.7096364 12.6041678,10.8639318 12.3828125,10.9667969 C12.1614572,11.069662 11.9179701,11.1210938 11.6523438,11.1210938 C11.4049467,11.1210938 11.188803,11.0917972 11.0039062,11.0332031 C10.8190095,10.9746091 10.6367196,10.8958338 10.4570312,10.796875 L10.4101562,11 L9.72265625,11 L9.72265625,4.921875 L10.4570312,4.921875 Z M3.46484375,4.921875 L3.46484375,11 L2.73046875,11 L2.73046875,4.921875 L3.46484375,4.921875 Z M11.7148438,7.21484375 C11.501301,7.21484375 11.2851573,7.26106725 11.0664062,7.35351562 C10.8476552,7.445964 10.6445322,7.56510344 10.4570312,7.7109375 L10.4570312,10.2109375 C10.6653656,10.304688 10.8444003,10.3697915 10.9941406,10.40625 C11.143881,10.4427085 11.3138011,10.4609375 11.5039062,10.4609375 C11.9101583,10.4609375 12.2285145,10.3274753 12.4589844,10.0605469 C12.6894543,9.79361846 12.8046875,9.37500285 12.8046875,8.8046875 C12.8046875,8.28385156 12.7187509,7.88867322 12.546875,7.61914062 C12.3749991,7.34960803 12.0976582,7.21484375 11.7148438,7.21484375 Z M7.578125,8.7109375 C7.35416555,8.7239584 7.09049631,8.74348945 6.78710938,8.76953125 C6.48372244,8.79557305 6.24349047,8.83333309 6.06640625,8.8828125 C5.8554677,8.94270863 5.68489648,9.03580666 5.5546875,9.16210938 C5.42447852,9.28841209 5.359375,9.46223848 5.359375,9.68359375 C5.359375,9.933595 5.43489508,10.1217442 5.5859375,10.2480469 C5.73697992,10.3743496 5.96744637,10.4375 6.27734375,10.4375 C6.53515754,10.4375 6.77083227,10.3873703 6.984375,10.2871094 C7.19791773,10.1868485 7.39583242,10.066407 7.578125,9.92578125 L7.578125,8.7109375 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_数字_normal</title>
<g id="icon_控件_数字_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16,3 L16,13 L0,13 L0,3 L16,3 Z M15,4 L1,4 L1,12 L15,12 L15,4 Z M12.6289062,5.0625 C12.9127618,5.0625 13.1627593,5.08854141 13.3789062,5.140625 C13.5950532,5.19270859 13.7903637,5.27604109 13.9648438,5.390625 C14.1523447,5.51562563 14.2942704,5.66666578 14.390625,5.84375 C14.4869796,6.02083422 14.5351562,6.2278634 14.5351562,6.46484375 C14.5351562,6.78776203 14.4212251,7.06966025 14.1933594,7.31054688 C13.9654937,7.5514335 13.6966161,7.70312469 13.3867188,7.765625 L13.3867188,7.8203125 C13.5117194,7.84114594 13.6549471,7.88476529 13.8164062,7.95117188 C13.9778654,8.01757846 14.1145828,8.10025992 14.2265625,8.19921875 C14.3515631,8.31119848 14.4544267,8.45182207 14.5351562,8.62109375 C14.6158858,8.79036543 14.65625,9.00911324 14.65625,9.27734375 C14.65625,9.54297008 14.6080734,9.78645723 14.5117188,10.0078125 C14.4153641,10.2291678 14.2799488,10.4218742 14.1054688,10.5859375 C13.9101553,10.7682301 13.6803399,10.9029944 13.4160156,10.9902344 C13.1516914,11.0774744 12.8619807,11.1210938 12.546875,11.1210938 C12.2239567,11.1210938 11.9062516,11.0826827 11.59375,11.0058594 C11.2812484,10.9290361 11.0247406,10.8450525 10.8242188,10.7539062 L10.8242188,9.9375 L10.8828125,9.9375 C11.1041678,10.0833341 11.3645818,10.2044266 11.6640625,10.3007812 C11.9635432,10.3971359 12.2526028,10.4453125 12.53125,10.4453125 C12.6953133,10.4453125 12.8697907,10.417969 13.0546875,10.3632812 C13.2395843,10.3085935 13.3893223,10.2278651 13.5039062,10.1210938 C13.6236985,10.0065098 13.7128903,9.88020902 13.7714844,9.7421875 C13.8300784,9.60416598 13.859375,9.42968855 13.859375,9.21875 C13.859375,9.01041563 13.8261722,8.83789131 13.7597656,8.70117188 C13.693359,8.56445244 13.6015631,8.45703164 13.484375,8.37890625 C13.3671869,8.29817668 13.2252612,8.24283869 13.0585938,8.21289062 C12.8919263,8.18294256 12.7122405,8.16796875 12.5195312,8.16796875 L12.1679688,8.16796875 L12.1679688,7.51953125 L12.4414062,7.51953125 C12.8372416,7.51953125 13.1529936,7.43684979 13.3886719,7.27148438 C13.6243501,7.10611896 13.7421875,6.86458492 13.7421875,6.546875 C13.7421875,6.4062493 13.7122399,6.28320365 13.6523438,6.17773438 C13.5924476,6.0722651 13.5091151,5.98567742 13.4023438,5.91796875 C13.290364,5.85026008 13.1705736,5.80338555 13.0429688,5.77734375 C12.9153639,5.75130195 12.7708341,5.73828125 12.609375,5.73828125 C12.3619779,5.73828125 12.0989597,5.78255164 11.8203125,5.87109375 C11.5416653,5.95963586 11.2786471,6.08463461 11.03125,6.24609375 L10.9921875,6.24609375 L10.9921875,5.4296875 C11.1770843,5.33854121 11.4238266,5.25455768 11.7324219,5.17773438 C12.0410172,5.10091107 12.3398423,5.0625 12.6289062,5.0625 Z M3.046875,5.1640625 L3.046875,10.40625 L4.234375,10.40625 L4.234375,11 L1.0859375,11 L1.0859375,10.40625 L2.296875,10.40625 L2.296875,6.5078125 L1.0859375,6.5078125 L1.0859375,5.9765625 C1.25000082,5.9765625 1.42578031,5.96289076 1.61328125,5.93554688 C1.80078219,5.90820299 1.94270785,5.86848984 2.0390625,5.81640625 C2.15885477,5.75130176 2.25325486,5.66862029 2.32226562,5.56835938 C2.39127639,5.46809846 2.43098953,5.33333418 2.44140625,5.1640625 L3.046875,5.1640625 Z M7.49609375,5.0625 C8.0924509,5.0625 8.55989414,5.20637877 8.8984375,5.49414062 C9.23698086,5.78190248 9.40625,6.17187254 9.40625,6.6640625 C9.40625,6.88541777 9.37825549,7.09179592 9.32226562,7.28320312 C9.26627576,7.47461033 9.1835943,7.65624914 9.07421875,7.828125 C8.97265574,7.98958414 8.85351631,8.14843672 8.71679688,8.3046875 C8.58007744,8.46093828 8.41406348,8.63411363 8.21875,8.82421875 C7.94010277,9.09765762 7.65234523,9.36262893 7.35546875,9.61914062 C7.05859227,9.87565232 6.78125129,10.1132802 6.5234375,10.3320312 L9.65234375,10.3320312 L9.65234375,11 L5.71484375,11 L5.71484375,10.1835938 C5.98828262,9.94921758 6.26236842,9.71484492 6.53710938,9.48046875 C6.81185033,9.24609258 7.06770715,9.01302199 7.3046875,8.78125 C7.80469,8.29687258 8.14713449,7.9121108 8.33203125,7.62695312 C8.51692801,7.34179545 8.609375,7.03385582 8.609375,6.703125 C8.609375,6.40104016 8.50976662,6.16471439 8.31054688,5.99414062 C8.11132713,5.82356686 7.83333512,5.73828125 7.4765625,5.73828125 C7.23958215,5.73828125 6.9830743,5.7799475 6.70703125,5.86328125 C6.4309882,5.946615 6.16145965,6.07421789 5.8984375,6.24609375 L5.859375,6.24609375 L5.859375,5.42578125 C6.04427176,5.33463496 6.29101408,5.25130246 6.59960938,5.17578125 C6.90820467,5.10026004 7.2070298,5.0625 7.49609375,5.0625 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

8
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg
Unescape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_密码_normal</title>
<g id="icon_控件_密码_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M16,3 L16,13 L0,13 L0,3 L16,3 Z M15,4 L1,4 L1,12 L15,12 L15,4 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
<path d="M5.09375,8.8125 L4.66015625,9.45703125 L3.41015625,8.60546875 L3.453125,9.9921875 L2.62109375,9.9921875 L2.65234375,8.640625 L1.42578125,9.4609375 L1,8.8125 L2.38671875,7.99609375 L1.00390625,7.171875 L1.42578125,6.51953125 L2.6484375,7.3515625 L2.62109375,6 L3.44921875,6 L3.41796875,7.35546875 L4.65625,6.53125 L5.08984375,7.1796875 L3.69140625,7.9921875 L5.09375,8.8125 Z M10.1953125,8.8125 L9.76171875,9.45703125 L8.51171875,8.60546875 L8.5546875,9.9921875 L7.72265625,9.9921875 L7.75390625,8.640625 L6.52734375,9.4609375 L6.1015625,8.8125 L7.48828125,7.99609375 L6.10546875,7.171875 L6.52734375,6.51953125 L7.75,7.3515625 L7.72265625,6 L8.55078125,6 L8.51953125,7.35546875 L9.7578125,6.53125 L10.1914062,7.1796875 L8.79296875,7.9921875 L10.1953125,8.8125 Z M15.296875,8.8125 L14.8632812,9.45703125 L13.6132812,8.60546875 L13.65625,9.9921875 L12.8242188,9.9921875 L12.8554688,8.640625 L11.6289062,9.4609375 L11.203125,8.8125 L12.5898438,7.99609375 L11.2070312,7.171875 L11.6289062,6.51953125 L12.8515625,7.3515625 L12.8242188,6 L13.6523438,6 L13.6210938,7.35546875 L14.859375,6.53125 L15.2929688,7.1796875 L13.8945312,7.9921875 L15.296875,8.8125 Z" id="***" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_文本域_normal</title>
<g id="icon_控件_文本域_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M15,0 C15.5522847,0 16,0.44771525 16,1 L16,15 C16,15.5522847 15.5522847,16 15,16 L1,16 C0.44771525,16 0,15.5522847 0,15 L0,1 C0,0.44771525 0.44771525,0 1,0 L15,0 Z M15,1 L1,1 L1,15 L15,15 L15,1 Z M3.23046875,2 L3.23046875,3.25390625 L4.74609375,3.25390625 L4.74609375,3.87109375 L3.23046875,3.87109375 L3.23046875,5.859375 C3.23046875,6.08854281 3.23567703,6.26757748 3.24609375,6.39648438 C3.25651047,6.52539127 3.29296844,6.64583277 3.35546875,6.7578125 C3.4127607,6.86197969 3.49153596,6.9381508 3.59179688,6.98632812 C3.69205779,7.03450545 3.84505105,7.05859375 4.05078125,7.05859375 C4.17057352,7.05859375 4.29557227,7.0410158 4.42578125,7.00585938 C4.55599023,6.97070295 4.6497393,6.94140637 4.70703125,6.91796875 L4.74609375,6.91796875 L4.74609375,7.578125 C4.60807223,7.61458352 4.45768311,7.64453113 4.29492188,7.66796875 C4.13216064,7.69140637 3.9869798,7.703125 3.859375,7.703125 C3.41406027,7.703125 3.07552199,7.58333453 2.84375,7.34375 C2.61197801,7.10416547 2.49609375,6.72005473 2.49609375,6.19140625 L2.49609375,3.87109375 L2,3.87109375 L2,3.25390625 L2.49609375,3.25390625 L2.49609375,2 L3.23046875,2 Z M11.1171875,2 L11.1171875,3.25390625 L12.6328125,3.25390625 L12.6328125,3.87109375 L11.1171875,3.87109375 L11.1171875,5.859375 C11.1171875,6.08854281 11.1223958,6.26757748 11.1328125,6.39648438 C11.1432292,6.52539127 11.1796872,6.64583277 11.2421875,6.7578125 C11.2994795,6.86197969 11.3782547,6.9381508 11.4785156,6.98632812 C11.5787765,7.03450545 11.7317698,7.05859375 11.9375,7.05859375 C12.0572923,7.05859375 12.182291,7.0410158 12.3125,7.00585938 C12.442709,6.97070295 12.536458,6.94140637 12.59375,6.91796875 L12.6328125,6.91796875 L12.6328125,7.578125 C12.494791,7.61458352 12.3444019,7.64453113 12.1816406,7.66796875 C12.0188794,7.69140637 11.8736986,7.703125 11.7460938,7.703125 C11.300779,7.703125 10.9622407,7.58333453 10.7304688,7.34375 C10.4986968,7.10416547 10.3828125,6.72005473 10.3828125,6.19140625 L10.3828125,3.87109375 L9.88671875,3.87109375 L9.88671875,3.25390625 L10.3828125,3.25390625 L10.3828125,2 L11.1171875,2 Z M6.0859375,3.25390625 L7.31640625,4.90234375 L8.55078125,3.25390625 L9.41015625,3.25390625 L7.6953125,5.40234375 L9.41015625,7.6171875 L8.484375,7.6171875 L7.24609375,5.94140625 L6,7.6171875 L5.14453125,7.6171875 L6.84765625,5.44140625 L5.16015625,3.25390625 L6.0859375,3.25390625 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_文本框_normal</title>
<g id="icon_控件_文本框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M1,4 L1,12 L15,12 L15,4 L1,4 Z M0,3 L16,3 L16,13 L0,13 L0,3 Z" id="Rectangle-45" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 493 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_控件_目录树_normal</title>
<g id="icon_控件_目录树_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9,8 L9,10 L10,10 L10,13 L7,13 L7,10 L8,10 L8,8 L4,8 L4,10 L5,10 L5,13 L2,13 L2,10 L3,10 L3,7 L7,7 L7,5 L6,5 L6,2 L9,2 L9,5 L8,5 L8,7 L13,7 L13,10 L14,10 L14,13 L11,13 L11,10 L12,10 L12,8 L9,8 Z M1,0 L15,0 C15.5522847,0 16,0.44771525 16,1 L16,15 C16,15.5522847 15.5522847,16 15,16 L1,16 C0.44771525,16 0,15.5522847 0,15 L0,1 C0,0.44771525 0.44771525,0 1,0 Z M1,1 L1,15 L15,15 L15,1 L1,1 Z M7,3 L7,4 L8,4 L8,3 L7,3 Z M3,11 L3,12 L4,12 L4,11 L3,11 Z M8,11 L8,12 L9,12 L9,11 L8,11 Z M12,11 L12,12 L13,12 L13,11 L12,11 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 950 B

4
designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.form.parameter;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIcon;
import com.fr.design.designer.creator.XCreatorUtils;
import com.fr.design.designer.properties.WidgetPropertyTable;
import com.fr.design.gui.core.WidgetOption;
@ -27,7 +27,7 @@ public class FormParaTargetMode extends FormDesignerModeForSpecial<FormParaDesig
public WidgetOption[] getPredefinedWidgetOptions() {
return new WidgetOption[]{
WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"),
BaseUtils.readIcon("/com/fr/web/images/form/resources/preview_16.png"), FormSubmitButton.class)};
SVGIcon.readSVGIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
}
@Override

9
designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.design.gui.core;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIcon;
import com.fr.design.i18n.Toolkit;
import com.fr.form.ui.ElementCaseEditor;
import com.fr.form.ui.Widget;
@ -74,13 +75,13 @@ public class FormWidgetOption extends WidgetOption {
return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER};
}
public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/layout_absolute_new.png"),
public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/absolute_layout_normal.svg"),
WAbsoluteLayout.class);
public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Report_Border_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"),
WBorderLayout.class);
public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16.png"),
public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/card_layout_16_normal.svg"),
WCardLayout.class);
public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"),
@ -93,9 +94,9 @@ public class FormWidgetOption extends WidgetOption {
BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
WFitLayout.class);
public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"),
public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), SVGIcon.readSVGIcon("/com/fr/web/images/form/resources/layout_parameter_normal.svg"),
WParameterLayout.class);
public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"),
public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/report_16_normal.svg"),
ElementCaseEditor.class);
}

3
designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.design.mainframe;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIcon;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.constants.UIConstants;
import com.fr.design.designer.beans.events.DesignerEditListener;
@ -373,7 +374,7 @@ public class FormParaWidgetPane extends JPanel {
private class paraButton extends ToolBarButton {
public paraButton(WidgetOption no) {
super(no);
this.setDisabledIcon(BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter2.png"));
this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/web/images/form/resources/layout_parameter_disabled.svg"));
if (designer != null) {
this.setEnabled(designer.getParaComponent() == null);
}

4
designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java
Unescape View File

@ -2,7 +2,7 @@ package com.fr.design.mainframe;
import java.util.ArrayList;
import com.fr.base.BaseUtils;
import com.fr.base.svg.SVGIcon;
import com.fr.design.gui.core.WidgetOption;
import com.fr.design.gui.core.WidgetOptionFactory;
import com.fr.design.gui.itable.PropertyGroup;
@ -22,7 +22,7 @@ public class FormTargetMode extends FormDesignerModeForSpecial<FormDesigner> {
public WidgetOption[] getPredefinedWidgetOptions() {
return new WidgetOption[]{
WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"),
BaseUtils.readIcon("/com/fr/web/images/form/resources/preview_16.png"), FormSubmitButton.class)};
SVGIcon.readSVGIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
}
public ArrayList<PropertyGroup> createRootDesignerPropertyGroup() {

15
designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
Unescape View File

@ -205,22 +205,36 @@ public class ImagePreLoader {
"com/fr/design/images/expand/des.png",
"com/fr/design/images/form/toolbar/pie.png",
"com/fr/design/images/buttonicon/widget/date_16.png",
"com/fr/design/images/buttonicon/widget/date_16_normal.svg",
"com/fr/design/images/buttonicon/widget/tree_16.png",
"com/fr/design/images/buttonicon/widget/tree_16_normal.svg",
"com/fr/design/images/buttonicon/widget/comboboxtree.png",
"com/fr/design/images/buttonicon/widget/combo_box_tree_16_normal.svg",
"com/fr/design/images/buttonicon/widget/checkbox_group_16.png",
"com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg",
"com/fr/design/images/buttonicon/widget/button_group_16.png",
"com/fr/design/images/buttonicon/widget/button_group_16_normal.svg",
"com/fr/design/images/buttonicon/widget/number_field_16.png",
"com/fr/design/images/buttonicon/widget/number_field_16_normal.svg",
"com/fr/design/images/buttonicon/widget/label_16.png",
"com/fr/design/images/buttonicon/widget/label_16_normal.svg",
"com/fr/web/images/form/resources/button_16.png",
"com/fr/design/images/buttonicon/widget/button_16.png",
"com/fr/design/images/buttonicon/widget/button_16_normal.svg",
"com/fr/design/images/buttonicon/widget/files_up.png",
"com/fr/design/images/buttonicon/widget/combo_box_16.png",
"com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg",
"com/fr/design/images/buttonicon/widget/combo_check_16.png",
"com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg",
"com/fr/design/images/buttonicon/widget/check_box_16.png",
"com/fr/design/images/buttonicon/widget/check_box_16_normal.svg",
"com/fr/web/images/form/resources/list_16.png",
"com/fr/design/images/buttonicon/widget/text_field_16.png",
"com/fr/design/images/buttonicon/widget/text_field_16_normal.svg",
"com/fr/design/images/buttonicon/widget/text_area_16.png",
"com/fr/design/images/buttonicon/widget/text_area_16_normal.svg",
"com/fr/design/images/buttonicon/widget/password_field_16.png",
"com/fr/design/images/buttonicon/widget/password_field_16_normal.svg",
"com/fr/web/images/form/resources/iframe_16.png",
"com/fr/design/images/form/toolbar/column.png",
"com/fr/design/images/form/toolbar/bar.png",
@ -385,6 +399,7 @@ public class ImagePreLoader {
"com/fr/design/images/m_format/modified.png",
"com/fr/design/images/m_format/highlight.png",
"com/fr/web/images/form/resources/preview_16.png",
"com/fr/web/images/form/resources/preview_16_normal.svg",
"com/fr/web/images/save.png",
"com/fr/design/images/m_insert/hyperLink.png",
"com/fr/web/images/flashPrint.png",

Write Preview
Loading…
Cancel
Save