Browse Source

Merge pull request #1290 in BA/design from ~HZZZ/design:release/9.0 to release/9.0

* commit '97bef2cb76c92244fca8d64ece83c8463c0d3046':
  format
  图标修改
  图标修改
  图标修改
  图标修改
  图标修改
master
superman 7 years ago
parent
commit
320a99a138
  1. 2
      designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java
  2. 2
      designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java
  3. 2
      designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
  4. 30
      designer_base/src/com/fr/design/gui/core/WidgetOption.java
  5. BIN
      designer_base/src/com/fr/design/images/buttonicon/card_layout_16.png
  6. BIN
      designer_base/src/com/fr/design/images/buttonicon/layout_absolute_new.png
  7. BIN
      designer_base/src/com/fr/design/images/buttonicon/list_pressed.png
  8. BIN
      designer_base/src/com/fr/design/images/buttonicon/new_form3.png
  9. BIN
      designer_base/src/com/fr/design/images/buttonicon/report_16.png
  10. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/button_16.png
  11. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/button_group_16.png
  12. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/check_box_16.png
  13. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/checkbox_group_16.png
  14. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/combo_box_16.png
  15. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/combo_check_16.png
  16. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/comboboxtree.png
  17. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/date_16.png
  18. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/files_up.png
  19. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/label_16.png
  20. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/number_field_16.png
  21. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/password_field_16.png
  22. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/text_area_16.png
  23. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/text_field_16.png
  24. BIN
      designer_base/src/com/fr/design/images/buttonicon/widget/tree_16.png
  25. BIN
      designer_base/src/com/fr/design/images/control/sortAsc.png
  26. BIN
      designer_base/src/com/fr/design/images/data/source/dataDictionary.png
  27. BIN
      designer_base/src/com/fr/design/images/expand/cellAttr.gif
  28. BIN
      designer_base/src/com/fr/design/images/gui/color/foreground.png
  29. BIN
      designer_base/src/com/fr/design/images/gui/color/foreground2.png
  30. BIN
      designer_base/src/com/fr/design/images/lookandfeel/FileIcon.png
  31. BIN
      designer_base/src/com/fr/design/images/m_edit/redo.png
  32. BIN
      designer_base/src/com/fr/design/images/m_edit/undo.png
  33. BIN
      designer_base/src/com/fr/design/images/m_file/excel.png
  34. BIN
      designer_base/src/com/fr/design/images/m_file/export.png
  35. BIN
      designer_base/src/com/fr/design/images/m_file/pageSetup.png
  36. BIN
      designer_base/src/com/fr/design/images/m_file/save.png
  37. BIN
      designer_base/src/com/fr/design/images/m_format/cellAttr.png
  38. BIN
      designer_base/src/com/fr/design/images/m_format/highlight.png
  39. BIN
      designer_base/src/com/fr/design/images/m_insert/chart.png
  40. BIN
      designer_base/src/com/fr/design/images/m_insert/float.png
  41. BIN
      designer_base/src/com/fr/design/images/m_insert/floatPop.png
  42. BIN
      designer_base/src/com/fr/design/images/m_insert/hyperLink.png
  43. BIN
      designer_base/src/com/fr/design/images/m_insert/insertRow.png
  44. BIN
      designer_base/src/com/fr/design/images/m_insert/subReport.png
  45. BIN
      designer_base/src/com/fr/design/images/m_report/allow_authority_edit.png
  46. BIN
      designer_base/src/com/fr/design/images/m_report/exportAttr.png
  47. BIN
      designer_base/src/com/fr/design/images/m_report/p.png
  48. BIN
      designer_base/src/com/fr/design/images/m_report/reportEngineAttr.png
  49. BIN
      designer_base/src/com/fr/design/images/m_web/datasource.png
  50. BIN
      designer_base/src/com/fr/design/images/m_web/edit.png
  51. BIN
      designer_base/src/com/fr/design/images/m_web/function.png
  52. BIN
      designer_base/src/com/fr/design/images/m_web/style.png
  53. BIN
      designer_base/src/com/fr/design/images/server/platform_16_16.png
  54. BIN
      designer_form/src/com/fr/design/form/images/delete icon.png
  55. BIN
      designer_form/src/com/fr/design/form/images/download icon.png
  56. BIN
      designer_form/src/com/fr/design/form/images/install icon.png
  57. BIN
      designer_form/src/com/fr/design/form/images/refresh.png
  58. 108
      designer_form/src/com/fr/design/gui/core/FormWidgetOption.java
  59. 2
      designer_form/src/com/fr/design/mainframe/actions/NewFormAction.java

2
designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java

@ -15,7 +15,7 @@ public class PlatformManagerAction extends UpdateAction {
this.setMenuKeySet(PLATEFORM_MANAGER);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/web/images/platform/platform_16_16.png"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/server/platform_16_16.png"));
}
/**

2
designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java

@ -451,7 +451,7 @@ public abstract class JListControlPane extends JControlPane {
this.setName(Inter.getLocText("FR-Action_Copy"));
this.setMnemonic('C');
this.setSmallIcon(BaseUtils
.readIcon("/com/fr/base/images/cell/control/copy.png"));
.readIcon("/com/fr/design/images/m_edit/copy.png"));
}
@Override

2
designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@ -601,7 +601,7 @@ public abstract class UIListControlPane extends UIControlPane {
this.setName(Inter.getLocText("FR-Action_Copy"));
this.setMnemonic('C');
this.setSmallIcon(BaseUtils
.readIcon("/com/fr/base/images/cell/control/copy.png"));
.readIcon("/com/fr/design/images/m_edit/copy.png"));
}
@Override

30
designer_base/src/com/fr/design/gui/core/WidgetOption.java

@ -127,27 +127,27 @@ public abstract class WidgetOption implements Serializable {
}
public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Date", "Widget"}),
BaseUtils.readIcon("/com/fr/web/images/form/resources/date_16.png"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"),
DateEditor.class);
public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("Form-View_Tree"),
BaseUtils.readIcon("/com/fr/web/images/form/resources/tree_16.png"), TreeEditor.class);
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16.png"), TreeEditor.class);
public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/comboboxtree.png"),
public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"),
TreeComboBoxEditor.class);
public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-CheckBoxGroup", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/checkbox_group_16.png"), CheckBoxGroup.class);
Inter.getLocText(new String[]{"Form-CheckBoxGroup", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class);
public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-RadioGroup", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_group_16.png"),
Inter.getLocText(new String[]{"Form-RadioGroup", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"),
RadioGroup.class);
public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Number", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/number_field_16.png"), NumberEditor.class);
Inter.getLocText(new String[]{"Number", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class);
public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Label", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/label_16.png"),
Inter.getLocText(new String[]{"Label", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"),
Label.class);
public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass(
@ -155,23 +155,23 @@ public abstract class WidgetOption implements Serializable {
Button.class);
public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-Button", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"),
Inter.getLocText(new String[]{"Form-Button", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"),
FreeButton.class);
public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"File", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/files_up.png"),
Inter.getLocText(new String[]{"File", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"),
MultiFileEditor.class);
public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-ComboBox", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/combo_box_16.png"),
Inter.getLocText(new String[]{"Form-ComboBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"),
ComboBox.class);
public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-ComboCheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/combo_check_16.png"),
Inter.getLocText(new String[]{"Form-ComboCheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"),
ComboCheckBox.class);
public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-CheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/check_box_16.png"),
Inter.getLocText(new String[]{"Form-CheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"),
CheckBox.class);
public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass(
@ -183,16 +183,16 @@ public abstract class WidgetOption implements Serializable {
TableTree.class);
public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Text", "Widget"})
, BaseUtils.readIcon("/com/fr/web/images/form/resources/text_field_16.png"),
, BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16.png"),
TextEditor.class);
public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-TextArea", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/text_area_16.png"),
Inter.getLocText(new String[]{"Form-TextArea", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"),
TextArea.class);
public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass(
Inter.getLocText(new String[]{"Form-Password", "Widget"}),
BaseUtils.readIcon("/com/fr/web/images/form/resources/password_field_16.png"), Password.class);
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class);
public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
IframeEditor.class);

BIN
designer_base/src/com/fr/design/images/buttonicon/card_layout_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 B

BIN
designer_base/src/com/fr/design/images/buttonicon/layout_absolute_new.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 B

BIN
designer_base/src/com/fr/design/images/buttonicon/list_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 296 B

BIN
designer_base/src/com/fr/design/images/buttonicon/new_form3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

BIN
designer_base/src/com/fr/design/images/buttonicon/report_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/button_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/button_group_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/check_box_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/checkbox_group_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 263 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/combo_box_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/combo_check_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/comboboxtree.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/date_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/files_up.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/label_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 359 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/number_field_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/password_field_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/text_area_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 365 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/text_field_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 B

BIN
designer_base/src/com/fr/design/images/buttonicon/widget/tree_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

BIN
designer_base/src/com/fr/design/images/control/sortAsc.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 345 B

BIN
designer_base/src/com/fr/design/images/data/source/dataDictionary.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 167 B

BIN
designer_base/src/com/fr/design/images/expand/cellAttr.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 207 B

BIN
designer_base/src/com/fr/design/images/gui/color/foreground.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
designer_base/src/com/fr/design/images/gui/color/foreground2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
designer_base/src/com/fr/design/images/lookandfeel/FileIcon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 232 B

BIN
designer_base/src/com/fr/design/images/m_edit/redo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 421 B

BIN
designer_base/src/com/fr/design/images/m_edit/undo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 450 B

BIN
designer_base/src/com/fr/design/images/m_file/excel.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 339 B

BIN
designer_base/src/com/fr/design/images/m_file/export.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 362 B

BIN
designer_base/src/com/fr/design/images/m_file/pageSetup.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 204 B

BIN
designer_base/src/com/fr/design/images/m_file/save.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 228 B

BIN
designer_base/src/com/fr/design/images/m_format/cellAttr.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 453 B

BIN
designer_base/src/com/fr/design/images/m_format/highlight.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 352 B

BIN
designer_base/src/com/fr/design/images/m_insert/chart.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 B

After

Width:  |  Height:  |  Size: 135 B

BIN
designer_base/src/com/fr/design/images/m_insert/float.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 143 B

BIN
designer_base/src/com/fr/design/images/m_insert/floatPop.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 236 B

BIN
designer_base/src/com/fr/design/images/m_insert/hyperLink.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 686 B

After

Width:  |  Height:  |  Size: 740 B

BIN
designer_base/src/com/fr/design/images/m_insert/insertRow.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 276 B

BIN
designer_base/src/com/fr/design/images/m_insert/subReport.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 279 B

BIN
designer_base/src/com/fr/design/images/m_report/allow_authority_edit.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 334 B

After

Width:  |  Height:  |  Size: 370 B

BIN
designer_base/src/com/fr/design/images/m_report/exportAttr.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 362 B

BIN
designer_base/src/com/fr/design/images/m_report/p.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 303 B

BIN
designer_base/src/com/fr/design/images/m_report/reportEngineAttr.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 452 B

After

Width:  |  Height:  |  Size: 413 B

BIN
designer_base/src/com/fr/design/images/m_web/datasource.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 335 B

After

Width:  |  Height:  |  Size: 440 B

BIN
designer_base/src/com/fr/design/images/m_web/edit.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 372 B

BIN
designer_base/src/com/fr/design/images/m_web/function.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 191 B

BIN
designer_base/src/com/fr/design/images/m_web/style.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 477 B

BIN
designer_base/src/com/fr/design/images/server/platform_16_16.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 605 B

BIN
designer_form/src/com/fr/design/form/images/delete icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 167 B

BIN
designer_form/src/com/fr/design/form/images/download icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 336 B

BIN
designer_form/src/com/fr/design/form/images/install icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 453 B

BIN
designer_form/src/com/fr/design/form/images/refresh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 606 B

108
designer_form/src/com/fr/design/gui/core/FormWidgetOption.java

@ -1 +1,107 @@
package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.general.Inter; /** * Author : Shockway * Date: 13-6-17 * Time: 上午10:40 */ public class FormWidgetOption extends WidgetOption { /** * 返回名字 * @return 名字 */ @Override public String optionName() { return null; } /** * 返回图标 * @return 图标 */ @Override public Icon optionIcon() { return null; } /** * 组件类 * @return 类 */ @Override public Class<? extends Widget> widgetClass() { return null; } /** * 返回组件 * @return 控件 */ @Override public Widget createWidget() { return null; } /* * 表单容器 */ public static WidgetOption[] getFormContainerInstance() { return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER, CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER }; } /** * 表单工具栏上的布局 * @return 控件 */ public static WidgetOption[] getFormLayoutInstance() { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute_new.png"), WAbsoluteLayout.class); public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), WCardLayout.class); public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/web/images/form/resources/report_16.png"), ElementCaseEditor.class); }
package com.fr.design.gui.core;
import javax.swing.Icon;
import com.fr.base.BaseUtils;
import com.fr.form.ui.ElementCaseEditor;
import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WAbsoluteLayout;
import com.fr.form.ui.container.WBorderLayout;
import com.fr.form.ui.container.WCardLayout;
import com.fr.form.ui.container.WFitLayout;
import com.fr.form.ui.container.WHorizontalBoxLayout;
import com.fr.form.ui.container.WParameterLayout;
import com.fr.form.ui.container.WVerticalBoxLayout;
import com.fr.general.Inter;
/**
* Author : Shockway
* Date: 13-6-17
* Time: 上午10:40
*/
public class FormWidgetOption extends WidgetOption {
/**
* 返回名字
* @return 名字
*/
@Override
public String optionName() {
return null;
}
/**
* 返回图标
* @return 图标
*/
@Override
public Icon optionIcon() {
return null;
}
/**
* 组件类
* @return
*/
@Override
public Class<? extends Widget> widgetClass() {
return null;
}
/**
* 返回组件
* @return 控件
*/
@Override
public Widget createWidget() {
return null;
}
/*
* 表单容器
*/
public static WidgetOption[] getFormContainerInstance() {
return new WidgetOption[] { ABSOLUTELAYOUTCONTAINER, BORDERLAYOUTCONTAINER, HORIZONTALBOXLAYOUTCONTAINER, VERTICALBOXLAYOUTCONTAINER,
CARDLAYOUTCONTAINER, FITLAYOUTCONTAINER };
}
/**
* 表单工具栏上的布局
* @return 控件
*/
public static WidgetOption[] getFormLayoutInstance() {
return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER};
}
public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/layout_absolute_new.png"),
WAbsoluteLayout.class);
public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"),
WBorderLayout.class);
public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16.png"),
WCardLayout.class);
public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"),
WHorizontalBoxLayout.class);
public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
WVerticalBoxLayout.class);
public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"),
BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
WFitLayout.class);
public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"),
WParameterLayout.class);
public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter
.getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"),
ElementCaseEditor.class);
}

2
designer_form/src/com/fr/design/mainframe/actions/NewFormAction.java

@ -22,7 +22,7 @@ public class NewFormAction extends UpdateAction {
this.setMenuKeySet(NEW_FORM);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/web/images/form/new_form3.png"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/new_form3.png"));
this.setAccelerator(getMenuKeySet().getKeyStroke());
}

Loading…
Cancel
Save