From 239be4dbde143bd06409bb37854087502ad2c472 Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 25 Sep 2017 20:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/controlpane/JListControlPane.java | 2 +- .../gui/controlpane/UIListControlPane.java | 2 +- .../com/fr/design/gui/core/WidgetOption.java | 30 +++++++++--------- .../design/images/buttonicon/list_pressed.png | Bin 1046 -> 296 bytes .../com/fr/design/images/control/sortAsc.png | Bin 404 -> 345 bytes .../fr/design/images/gui/color/foreground.png | Bin 2970 -> 14799 bytes .../fr/design/images/lookandfeel/FileIcon.png | Bin 3014 -> 232 bytes .../com/fr/design/images/m_insert/chart.png | Bin 151 -> 135 bytes .../fr/design/images/m_insert/floatPop.png | Bin 222 -> 236 bytes .../fr/design/images/m_insert/subReport.png | Bin 279 -> 279 bytes .../com/fr/design/form/images/delete icon.png | Bin 232 -> 167 bytes .../fr/design/form/images/download icon.png | Bin 706 -> 336 bytes .../fr/design/form/images/install icon.png | Bin 705 -> 453 bytes .../src/com/fr/design/form/images/refresh.png | Bin 474 -> 606 bytes .../fr/design/gui/core/FormWidgetOption.java | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java index 83cf7a50d..bccff1ad7 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java +++ b/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 diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java index f1cd5f874..c5e12fa69 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/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 diff --git a/designer_base/src/com/fr/design/gui/core/WidgetOption.java b/designer_base/src/com/fr/design/gui/core/WidgetOption.java index e6326aa25..c7cff45af 100644 --- a/designer_base/src/com/fr/design/gui/core/WidgetOption.java +++ b/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); diff --git a/designer_base/src/com/fr/design/images/buttonicon/list_pressed.png b/designer_base/src/com/fr/design/images/buttonicon/list_pressed.png index de264df1ed26145e40c2ac9f68064b3992dad397..9914c24d3fdf432574893871922530a18958fddb 100644 GIT binary patch literal 296 zcmV+@0oVSCP)Px#;z>k7R5%gEQ#lU8Fc6Fn38XX>q~bGq2rX}*;RE~wev>?d0xFs`#9re;OcYrO zkTh7bc0D^Yu~%7DmgTZ(nw4`-XA_pSR`NW*o1!SzQ^oj>h$!#Ieq1HNkU0Ed5#2LRD ufEfSzGX-hXn5q=~^$e}XNX{|gI6nco@?Z1ZHsb350000E7#>>9uoZ-Yv^ zWrRT`LQ;4BfbgO#v7iejsH>m|^fI~$in{8y&aAs@7i|M)&Up{-^SocrSsER=(9wRp zogj#g?68o-`%!ltI*9)dmri!zts4y%(3mlWDv||>lwuSi$ZFCw%t1++yZ#o&3BuE> z<_oAGUgBj#qa@ddax@d82_in=n36mL5h%iGRZoyVUcM%QswBwqu*isJ2A0&}c?*us zkL2a~8JSbaf%72l@R&e@NCJ*FtJ}PjAgjDQKD*a6392q=CPD5cRS-u(#;_m=QxU(+ z1VSLnQGswI%0Q-qf-E6q@-$tkRH#aj zGOTGjz;PVSur$m1v4`KD(~;!(b=y~G5TGqvs)s=fz8OX3ph6ys6YS%!oD9NhsUY@Cv?c#h44+00NV9f_m^ zfx%EL6bo{=Who}cG0{+@jui~KtU(>svC2L++!X5yLNjq>0b1$}s0>+#2C9YgYV%y! zrhGN5(ma=7Q!I^>q22NRHSYQq){uK_h!-0T`9mFR-ooNu>Hn~RAI4%D)1D2lZ|B~YPYR|kUcPqw l81RfGy?tH3j^Ahu%5np=MQ}TM(qFq diff --git a/designer_base/src/com/fr/design/images/control/sortAsc.png b/designer_base/src/com/fr/design/images/control/sortAsc.png index a5be47df3be57c1fb3a9fbcd7dea8e7b54755fbf..9fcdee421e6f728c57468c2c2fcc5a89640bff80 100644 GIT binary patch delta 319 zcmV-F0l@y01K9$QBYyw^b5ch_0Itp)=>Px$6G=otR5%f1G%+#pWME*N#Q+BX)6SeZ zvmL^QkjBO)|B?A1_Sv&%7-3>85Y0^K|NsAIWMpIj86*pnB!*@pMiD+WKo|T^V_^6< z3urqKfY_t~7O0;|ayGIRlzV|tEFjy4jXexv0iL3e{by`!T7LtK(q?2aY-~nGrW$5! z63?GMJ0v9~tpJoWz$On8118(~XU?21VFJa1iHYfB2nOW~2vAZ|NC7I^1mh#qAaO-S zg;bCjFdcw05-2Y)W*{;Z1H)SA}A_~r3j+P4PE^^ zF5=L!5a=%m7DorM9UKaFtss?xpddsC7nkDTP};ov98zM^B*lUs9LIa_zVE&7xFZ^a zn>R6@n}k#_ke4=s`_$mlA>6!)X{YeW)rwDa^Cq}j`MZd`zJCJmZ-aN%yj9!;9~U7X z?tKy4w&6GqY&*uDyRs1K$kht?U>AH;@N+^4wA*b6AwmKwZ>{3_{f##6njZP2gpadR znpYJ11n6Z>!TL9pr0Lc4lj9ZZoQS}m`cQFGQp?H0QRvNu}DzhznI^?I-@D{>DZSX+t66A#h4F> zB$D+SVVs<8Xq-qGAw@*Ae7hw1l}Ii87IIx(@?-d~#6dC28r(rYwy4f%^mX1(d;|Z2 YA4QU+X0V%4m;e9(07*qoM6N<$g8X{1lK=n! diff --git a/designer_base/src/com/fr/design/images/gui/color/foreground.png b/designer_base/src/com/fr/design/images/gui/color/foreground.png index 1803c11179d9c1c0d0d229328b73d0ccaee7b0bb..faac2e1ace4baa0aeb3d436f7c62a76c65828a2f 100644 GIT binary patch literal 14799 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 literal 3014 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 IM6N<$f~c#TrT_o{ diff --git a/designer_base/src/com/fr/design/images/m_insert/chart.png b/designer_base/src/com/fr/design/images/m_insert/chart.png index 504ca9484729be763d7f3445dd5d47ca7d0904a0..c6de0fe5e05a697ee5ae011930c47bd18ea5ecfc 100644 GIT binary patch delta 93 zcmbQv*v>e?FwD`@#WBP}Fgam?fWf0n`8heC@+hAuj*` delta 109 zcmV-z0FwWQ0ha-gF=kOoL_t(I5o2JW5HRA>|I}3PKeC+k=}TDEG9fD>hs{EYChgV} zD6YC%ZNW&f3kKc*a2V8`_CfJmlj#<$A&xD)2Hp#!E?{7wI1I2wElFYkRTm5(_DYKr P00000NkvXXu0mjf6h$lg diff --git a/designer_base/src/com/fr/design/images/m_insert/floatPop.png b/designer_base/src/com/fr/design/images/m_insert/floatPop.png index 91600bd0ff169e903f3267d0c64ecb173160c238..46dca4f87187786c8d8ed09a0c38776c734b3b4e 100644 GIT binary patch delta 208 zcmV;>05AXE0qg;gB!2;OQb$4nuFf3k0001{NklntPldboSYJlkRAYaY%i7rx&O`p0000< KMNUMnLSTZEnobb_ delta 194 zcmaFEc#m;{N%I zXV0Exm^EuATrXJh%$c+P6AM6UVK%V97%bJ9 zl<&cG=kLG&7+9H^z!IGN@@4 zF~f_GpBYx4xxjGp?gNH*U%xVJJa?G^B!><#0&(xPTMXwPK0#N<@bK+B29O+st2&At zh5_gDK?+b6q3A&4U>GoP(Fn;PXzs(o1*xSP001^ydc<4m00#g7002ovPDHLkV1fW3 BZjk^0 delta 251 zcmVu7BDa{#4`{N7W(-3B!F2U z12%8o{GSv6RS(w7#6TfnLFNFxLQn(H>9`F*mmI<_02x%i2XwoJP8SB!U9k7sEe3Hu zUIrZ*N#b1q1GitkW;pxcF#{hb2Vnz{HC}o0oZ-xaM+_go{Q&bneg6R#V_=XZ&ILzq z-vetx1|TuK1|YlOW2^NLO9u;qwv&{dVGMu(0|0eefKFN`%%=bV002ovPDHLkV1k># BTjKx# diff --git a/designer_form/src/com/fr/design/form/images/delete icon.png b/designer_form/src/com/fr/design/form/images/delete icon.png index 398c5db5c5ca1ab9896faaf3163fdd416b8ed7b1..6fb2baac51ead86742e20545aa0a62413be50b12 100644 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|5K|k5|2~(;g&RwlQDDH z6mGYiaof(gobd%$;YW8~2X4ulg}lLC>)IYUq%_XtS$r|Kq4RPN8^beAv5Lrm+Yvy^ O7(8A5T-G@yGywp$2|2L< literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1IgMV>B>Ar^vf zC!ghQP~d58v@KEi%A;%{J*QN$ls`vUu_2&SUFfM(y eMSsJ$U;TPx$3Q0skR5%f1U>MZE#Kd$S2;*}k3qHyJ{~7e~$%EvW2q_>WPhA5{fxyJX!Wx&Y zAUTj4WO)=90R3FV!0`8=iHTVpvLX;0BKG$nL=8fg8Np;=P*PIb_xtx>M+S!fInvTn zZx|RD4MFliHtYZY|7QXDr+9g}BOg3?@B^lg5ypVg4h{}HpFe-y2sFeADE1R7&JNVP z52)Gyz<~o_U}`}$h5;Z!pdlPzzI>wK4-a=3P&3?SkT?inH2@?5G=$~L zmoNPwHV+R^AyD%l5E~u94KOw~&17W!Z;Y-08~^`*#Px%d`Uz>R5%f1V4yN!BxGK5bF=2ZfB)2g>WqQ-EGsMP&8n)Z8@Tl0G;rq3nOyJR zzn==!7$PAd@mE$>mhFMd;kPT%*=D^q|PoA7DARzEJBqRjIFpxYG z6B9#0K>@S2w)S_R52nNPz-SBuL16}z49U&SWriujMh682aRSAIf$CL};%h!w3x1waBhSF|e_*(Gh6i z{}(S_{6sgTa_wsd5Jm<*K0Zu=fq@{QYb`A;79a)-hyW%LR$u_H=H%qGmy?rYb9Qzn z%7q}ky1Kdy+}zwOt5&UAJ%9duRj`4tU%$Shs;a6G8XC$*DC|InpaUf(B?e((VXh}n zp13f9yvfGKCQGhiFvF#!q_}{grNjhukvhr!SdO&XG*}l%ZzTQsyI8twP(K=zW)3NHb9(@g(238pMe?bx679=Gpt*; z4&+^<%F4=@;9L(%HlUaWMGh!D1qB7+$;RH^p5fK!zYJ6Ny$2hZ?Ig$`#>>pGdGqG) z&!0d40ZeWmfQj1+R-_?{5ukEVj00V$4#eVM-9VzYwzd((u3Gyh0YtY2i!1=qO-)TX oKy~+OYHD@>X^8Vd5`!K90EipkNuYIzbpQYW07*qoM6N<$f|`0kdjJ3c diff --git a/designer_form/src/com/fr/design/form/images/install icon.png b/designer_form/src/com/fr/design/form/images/install icon.png index 37877a62c3e90719bd70714eb6c569e06d317dd1..5cd5db7165593c7364dcbeb533fafad91b8525b3 100644 GIT binary patch literal 453 zcmV;$0XqJPP)Px$e@R3^R5%f(Q$0@tK@gqYg=?)$B%X4J)*^3!3VuG9X_whmE~X@ z$MsgL6(c6)`zb>mKkE}Xl4J_5 zf)6aqvP}kiB9mz1#m5L)F_Jdd2>2_E$K%BATq<1Uib0WEa0-Bih2hpko>P~XI0*?M zZYvell~P`Ee4j%N#F@#%aC@Ux+nvwnvp3U&C^~#%=1X(9cxN;ky`ZGsZimZdHiKWX zX_`JX{1r;XuUy;2pogc@n$BG3vrJ#{&gW2r|EVe_Qc_>*>NR5i8L^0>qZ|8FSgtWK zNYnchM|uGa3GXy?#CNEa?6{ZkJy1%$a*-|yF-T^3tPXrLTv%(HYd9}}$-;y|9Y@4H vZ8eWI^$`PCoPx%dr3q=R5%gklTBz7Q4q&xc9UAP2suPa8j|*4p``~armbSJ7YW*nP|}MCIa$Pu z1uvzkM3S_KqTo@~AgLe?loqU~qCKgYh~Pm)MDn4DLWKya#3Z}pyvSQN+t9P%JLJuq z|I9D*=FI~9>kG{V`lH#Kd_E6|k0<85GZ94HtdGUBt}5XTA_#Eeqx8J*vRN0lA|1zL zMIQl96TlAys;tLy$>1`nQXfxHC&M;~=o}(d>}bC&HS=x&yZc-vKzNS|CK-AL0CU-o z`G*mrW=y46ILojBk&KEh@FMKa341u2?HzwkHerip08>*~v)Sz-&|#85NdeMnAjq%B z^Y;Z5K|l021whxe5n=lm3MX~IcfVd1j!CVhhr&5}z1XkS>PbReVMvhoRaJo}T7!}- z_lp=r)OcIrUQX~I+q*hD+?!Y2TTM;;SeJyN0x1ObwNBa{zV4tkPMi^xXnNjzRcbpb zl!Aa#qwdiOZdqYm;b-piCqzi5=X^^tN9;y3%}!z4HQcHaEL&kLtqwW8Q+KDaZp{(r zwiS*ol$=$)_G||Xajk3L{?O)(qudTAe8wxwfZbrA+OBPH|NP*Oe>p7Ut$Pb_H`o!U zH<+32e#n4*BD`3(_xk<55_|;aKhsSNN2jCwQRC z=E}@T!X8~L^)wo_B_8a-F2`Qa=A{D_;WsMe*&Px%7)eAyR5%f>Q_pJ?Q4oH!$)={RloV0$X0-|mrTBJ}<{((~U_iYHLGYr7RzX3p z`VZKH2TS$ht>>KdpooW!f+m``R*&LO@FKNF4@xoF-SL}E(^QEf*nzh@KfZ6?%)IxM z`cI+X`K3~6U~%#DMIt`V%)1az6VZF6=ni~yjYi`G{8TQN?MkK6`Xxa=pLe5(=au3; zk{HCd(3hCiZkR)`mx(5A0tW~Hs;BF39c2bj}9vJ@fyfeT|X+Iqyo!Y zm;!kmyU+F`3xViUek~cUCGjT-(9qA4X>t4o1dw}D%(C+D4t+p)jPx$lu1NER45gFQ9VloK@gp}Lp_kb0ma3a4Cg0{MQWo>qmR;|iwi078t(??S-dSIWxi7u4+3d!0bO zo(Atel}njesN=EWk!~hg@6mx2$s^;WHebI&3NvYX+_U| zbh4a832~RZVhxTB#YWnXIC)1;^!6+wecO)($-u(BCnma=Af@-zYU@bpji?}p>;_^5hnJNw7{1*;9CPv9PI Q0000007*qoM6N<$g7>b`)Bpeg diff --git a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java index b3fa73a26..18fe7a83e 100644 --- a/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer_form/src/com/fr/design/gui/core/FormWidgetOption.java @@ -1 +1 @@ -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 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); } \ No newline at end of file +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 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); } \ No newline at end of file