From 471e4bb3371db5c5b6721cce1fef3785c474c9d1 Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 25 Sep 2017 18:31:42 +0800 Subject: [PATCH 1/6] =?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 --- .../actions/server/PlatformManagerAction.java | 2 +- .../images/data/source/dataDictionary.png | Bin 216 -> 167 bytes .../com/fr/design/images/expand/cellAttr.gif | Bin 254 -> 207 bytes .../src/com/fr/design/images/m_edit/redo.png | Bin 318 -> 421 bytes .../src/com/fr/design/images/m_edit/undo.png | Bin 343 -> 450 bytes .../src/com/fr/design/images/m_file/excel.png | Bin 372 -> 339 bytes .../src/com/fr/design/images/m_file/export.png | Bin 287 -> 362 bytes .../com/fr/design/images/m_file/pageSetup.png | Bin 203 -> 204 bytes .../src/com/fr/design/images/m_file/save.png | Bin 218 -> 228 bytes .../com/fr/design/images/m_format/cellAttr.png | Bin 1101 -> 453 bytes .../fr/design/images/m_format/highlight.png | Bin 399 -> 352 bytes .../com/fr/design/images/m_insert/float.png | Bin 186 -> 143 bytes .../fr/design/images/m_insert/hyperLink.png | Bin 686 -> 740 bytes .../fr/design/images/m_insert/insertRow.png | Bin 303 -> 276 bytes .../images/m_report/allow_authority_edit.png | Bin 334 -> 370 bytes .../fr/design/images/m_report/exportAttr.png | Bin 287 -> 362 bytes .../src/com/fr/design/images/m_report/p.png | Bin 3132 -> 303 bytes .../images/m_report/reportEngineAttr.png | Bin 452 -> 413 bytes .../com/fr/design/images/m_web/datasource.png | Bin 335 -> 440 bytes .../src/com/fr/design/images/m_web/edit.png | Bin 503 -> 372 bytes .../com/fr/design/images/m_web/function.png | Bin 256 -> 191 bytes .../src/com/fr/design/images/m_web/style.png | Bin 374 -> 477 bytes .../mainframe/actions/NewFormAction.java | 2 +- 23 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java b/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java index 4448c10249..f8f1cd655e 100644 --- a/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java +++ b/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")); } /** diff --git a/designer_base/src/com/fr/design/images/data/source/dataDictionary.png b/designer_base/src/com/fr/design/images/data/source/dataDictionary.png index 2f0fc8c87092a57518bebbbf2d323999de404157..516d368b276fa5559696bf9ac6571194120aaff2 100644 GIT binary patch delta 139 zcmV;60CfM@0jB|wB!2;OQb$4nuFf3k0001CNkl0nY)DB!2;OQb$4nuFf3k0001qNklV!(9NfiCb8g;B)~gE`ebdY_?%@ z2}}$JZuKD;FJ7&G88VxY`&Tin?+18+pyV43}7P0nRo#yp^i-)XCM;m62<|~ cjQ{}#0OSbEqow(^b07*qoM6N<$f)V&t3IG5A diff --git a/designer_base/src/com/fr/design/images/m_edit/redo.png b/designer_base/src/com/fr/design/images/m_edit/redo.png index d9225f68b3cead6344e9d12f1a044cc22e570d59..f6b77b4f471dadeb9f02f9d29d26b20f0caf3e9b 100644 GIT binary patch delta 395 zcmV;60d)Sp0;L0xB!2;OQb$4nuFf3k0004BNkl@BhVB^Mh36br%%5Ci7~?@V01%61JmcvUyB$RzH9($j(-G-8^h$Fv?K!qW3a5O z?6#**pT0wJ0mRnl8-RXxMbm_hyY=kZGd}Pz0NKpQNStP%H?|843x$JBg?r)4moFti zn=_ED0xEn0^zT-nm@Yz`aRDzcchug!dw+t&z+NymcHw7a{P+kMSbRWDe}D!}V`XLT zKXKy31CSzPV}FzXAR4H={p{J(RS-6WWC05^eu{-^J`J=n@ywaiSCJI~+5Z?Bnexw^ zIW+}MoB?dW|Ns9yfHvP`Wo7X=e*E}5bVZDe%;9IwoLqx04(FSgm|iwBGgE{MkjgMN pHmxO94@^BY8d+Au1n5o!0MIOLH#UbIng9R*07*qoL(2xlz20(2+ z0L1)6dTSxjkOU^EW(5*8!vQQ17m%pA5o9~q3&7}c0Mh%hDB1`Lc_?0w6o>^t%?n_P zSU>_;G=da8Knh%#W(T171!Tn_100a}iO8lSfs0VhA28AZ&T53B!2;OQb$4nuFf3k0004eNklH^6lHVzCL^Q>=;N4>;)uA z24iE>Hef7Nf`7!$o;?GWx3I8K`2G8DA<)1qU^szd?jr+(fc)9Bdp^RQ0yE_7+0#{w zj7+&eK0L5aoH+3SD4q{AzyRo?(?B_XM#fLEAUzlcfCSH+IW>imkvSa1Mh2%(pT5e< z%HjbuVwi)xcL3;O1-Jn~(-MGmBZ-DAz!r!ggC-yaVjvJ3 zK(Rj-gB*dDA7DgINYH3J05Sw9$%rJb05u%hpp8H^0VrVr4IGf-i)i8xK#GCPL?mGc z6fY19pkAF1H8q%#)K~y%0tMhga-$Ij3UFp7VlglQHh^eGO0zRSfB^t&2CDA*qaqgo O0000og1ZeCkl*2LWpxFWbQ)@5V)8(jPVj7?296jfPZb98-!Tky6zOP=8Z%Y zMVV!p3sFQ82*dDEC4-_UuYfgg1mGHZ{>&I-GsaK=8NEsO@6t5EVg;X@k^r*rx6!fjoa5!Fn9WcfgvfO-h8@Q4&1?-XqOmbvg`wsLOgQ%|f~Y9LNj0ux&~a z;4ZqbQ=od=@-Z(57-J0tx=!ZtwgYL1{NC-NKK>El&(c@?E%ychWpi}Pzfmaw0000< KMNUMnLSTX*e1u5= delta 345 zcmV-f0jB=b0`vlqB!3BTNLh0L01FcU01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DL zVr3vnZDD6+Qe|Oed2z{QJOBUz0ZBwbRCwBAG+8-y0Rsa=JOcsn`|0z$7YdtI(8ZZx zn&UML8K&C%!6kC^EE(D@-QoOy-@Ypw^w-|OW&jv0ym6j^mw%0&Ay7$+K~qo^Ot+ss zfT9?iAxy}e_A>{-HdmTBfHi;m^%KJ@=!T#eaQ*#jh8sZ42Xx7v$9Hjt2eKh7$Pyr@ zOY`u7Z3cN^{k>~&Id)YgbaRw33~0A98!u rfp-B5wtyi8fV{Affjj`#2M}NY9{7inXV6Eh00000NkvXXu0mjfB-4*> diff --git a/designer_base/src/com/fr/design/images/m_file/export.png b/designer_base/src/com/fr/design/images/m_file/export.png index f0908eae2ad49535b833edb03acd5c9174ca7dbd..c56ee44199cf5c740f354e30d33c76f5e3c928cc 100644 GIT binary patch delta 335 zcmV-V0kHm`0_p;gB!2;OQb$4nuFf3k0003bNkl-#@cKT%0bz<|>#N zBLm|{24?0|yapT$SPO|`m@Xg<@)jc_!%twy1%R9nk|NCujKE-IVv0ZDyXJt2iCF{5 z1~4-+dLQszy%MDH|NnpWAQ~P9u#^Q71Oa$5g>b>-KEE~Fk+@(c*b6{^H83(VUghHA z6vL(wT@x}NY)HVFGiQLQ>i_ER-+%14va%9GRzQdi4@8(DzkdDRM@SR0JVsQRn3&W9 hQ(FVFB3x{ccL5C8TUy$~7JvW%002ovPDHLkV1gV%k@5fl delta 259 zcmV+e0sQ{z0-pkqB!3BTNLh0L01FcU01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DL zVr3vnZDD6+Qe|Oed2z{QJOBUytVu*cRCwBA{Qv(y!>n1e{xgsP($dlxSzsJjcQ=wW z@7}o!OfxZ12q-oH?gd4814rTTL5g9nKxZS_j6D{x#WRYNk)jX70AQ9TD-9?!og9KAf z&IE)MBFJ8MQ6|VB!IYCT0U?D5YJMscv;=C23Ep0i$xVMAWtHw11+1 zg3fepoj190!4fhU>wKwR)4D%BPQkhDMKAU>k~NS zfOqCk0AjIte`JD1#elI%lphp{V#3H=e$1$YpxR85WD2f=4=l^FO$K`+lW5|_#|T+5 zk~Y@}_$!RZ*>NR5i8L^0>qZ|8FSgtWKNYnchM|uGa3GXy?#CNEa z?6{ZkJy1%$a*-|yF-T^3tPXrLTv%(HYd9}}$-;y|9WO`3J#96QHT4k#SDr%f{t7PH g;ZOfeF8|N?0oLAu9puL7Yxh@5WukMjLvzW=t55y$B>F!Nl#K7SQ!|Pv>Z!k;85UUY+y)AO!)CzzVk4H zfP=yx_EYI>f((o-*A5+FaS{LtiSqnEz`?}8#No;Mc>jC{GY5u7)_;GQm5u?8XLe;^ z>R?^;M*i~u|8IEeXVh>7}GW|96ta5%>Vk$#tbY1 w+;`5taS*;KDFHN7k>L>|qXR=?1)stJhU;x|Hk~uJfeH%-Pgg&ebxsLQ0GGvg%m4rY diff --git a/designer_base/src/com/fr/design/images/m_format/highlight.png b/designer_base/src/com/fr/design/images/m_format/highlight.png index 7491cb9c23367c4cf94630bd83651bcc83d17318..14ff765e43e622ca8e13d6d9b3db141625ea1942 100644 GIT binary patch literal 352 zcmV-m0iXVfP)Px$8c9S!R5%f1V4xCUB*z?MW3y03#{bR#|NrM?U|>!?d-mimCQ=P@aB$#YWc-&3 zG(;V!SB`<Px$Nl8ROR5%f(lD|vCP!PxOUeZ+54tDD3>_1SQq?4fFRzYwHTJ#?hT8cOb4t5h1 z#6ocrXF(lx>r{tUsjo@SyMz~rrm?|;fUbyW0T3U02hOVcs{(;XG`aCTyz_h-Sqirh@q@V)VKWU3%o*1J zXo>Z=#)S9hVlcIZBrH-B_-@&>-gS$Qa*|rXbeJ`&gvu1Ip#U_L!PC{xWt~$(695s>E{^~J literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP?5W*i(^Q|t)w6S|Jxs47rXmk zb4HMX55IE9K?lYJmYJKXzrXvhrnXEa)28^DN%QK}+RDPrtqE5e0-4#`8Aa07*t|9y cJ2WsdRQ@TrcvryY9MDJxPgg&ebxsLQ06z3OU;qFB diff --git a/designer_base/src/com/fr/design/images/m_insert/hyperLink.png b/designer_base/src/com/fr/design/images/m_insert/hyperLink.png index a23db4f76a59e4552679c6f46e238d66fd772532..b81a666d5ace4362ea458964dba1c0d33ac12747 100644 GIT binary patch literal 740 zcmVPx%o=HSOR5%f>Q%!3VQ51b|Vq$2GA~wMgOxxh5h;A~$l7hPm+HMqL7eYa-KS1b4 zcl`&taiP(LU;}1b4cI_~hz&_*rB+w@C>XRLhS*>}=XuT~8ER=)`pBJo-o59(oOkDr z5dUe(gU*RWBIlG6OR&pAs9>KXx1|(sVDWrD|7m}nV{af9i@8QdMjtAro=GVuQFKB| zZ3TD(_$s(l$Snr~0pHBbOnPf;t2eB-74eW_v7ACd6iU819CFb#)rvQGS150yz)t3361| zsMTs0s@3XiV4?BR?}=IfOrZEXdXP3v5s^}DGS5ZK7<1$xvWjaiu-3}+5e`Ql;Gd2F zj)CMtPkt(8-hc;J9kqy3wtx}RUc#RQzlHb@Sf^0P-?bEBGYdNd!ZjX#5onPDSP8=#PA;l{kw%Yikw|J?y4ddOmr6`-te#QtqR?5-j zA!y)6C^R`YoZ5p<;+Ie=m6kCTY{{&ph(spfdc|U?=J6c!W14rvVcotOIeV936ePYk zPqW#o0^7Z`Il3N6V_NSG4z}a_0rR@9-v@u4Ia|??7>!2959$#W>{IwxkB0UC?Ee7f Wx-kBTvz>e?1vK=^hfiN$0)-@C3fb9M8H}}57(|5l zEH>{ybUFT zCiv>z$E!&Gytwno*;1J8Y(VF)+kN!!lNWC;{`w8JhvD6a&nX}pZou}#XY8K6ddu+g z?T0Tve*Io6Cn@#=CU@iBV+Ji{Ic7#iM*XKR-+;x01bEM&7yz;j! zUtJ$4{1G|$KY#tkaO(0ch9l>|jy(V~U?Z|27jNAEC@jGLhLx2iFFwHK1ur)j12YrT za}h!QwII!J-hX1adH*RqL4gdIfELdIY^*F-Knxx(4s~BgvzdSY{nOfY^qkP=uiv48 zD779vA%Roj)tCPmR$cz{@8=(c*Fd1dgY99(j$iU<7J;ZDKZx?`^=fsV0jb+Kq4RskU=m7ATexwkT?in7yxqxjD{$K7y@G> z(-;Pj>Ha5gT+`opi` zQeXo>E?{6N2MZ!g!c`Gsz|sLa4NDs^adbXLIsjP&3w;<3vmBid6Q?*9Fbsg%1fyX# yq4QzlCK9~YRG$Tj>Ffb^~jf8B$Cl3JHp`wkd634Ir0000M*H+f pnk*aHZtu5dv(KK)TN^~^eFI!WfU?6onFIg;002ovPDHLkV1k#JsA&KI delta 307 zcmV-30nGmL0?q=EB!3BTNLh0L01FcU01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DL zVr3vnZDD6+Qe|Oed2z{QJOBUy+et)0RCwBA3=R%nz`(!|&p;kn$N)6pKM*h=V^YMJ z7$^h-ZvZ36ACwrt0wUI|S;L4d7!nflA11~dw=Mukfntguh<`r~Kx!E9qw|5TQXs{EkLY}$7akBDi0_!i8P2oWG5ldio+yWrh2Z@6WInC~T5y+eXbj1RYIu=|u12yByBOt@(1LYmuVJ<)icUW~9h{#~^ zAaz&`c*decR4gI_sRJ3X5abtRiSJxdL>cg%k(&V^zyQG!Z)6Q^wk`kw002ovPDHLk FV1m+Bbfy3R diff --git a/designer_base/src/com/fr/design/images/m_report/exportAttr.png b/designer_base/src/com/fr/design/images/m_report/exportAttr.png index f0908eae2ad49535b833edb03acd5c9174ca7dbd..c56ee44199cf5c740f354e30d33c76f5e3c928cc 100644 GIT binary patch delta 335 zcmV-V0kHm`0_p;gB!2;OQb$4nuFf3k0003bNkl-#@cKT%0bz<|>#N zBLm|{24?0|yapT$SPO|`m@Xg<@)jc_!%twy1%R9nk|NCujKE-IVv0ZDyXJt2iCF{5 z1~4-+dLQszy%MDH|NnpWAQ~P9u#^Q71Oa$5g>b>-KEE~Fk+@(c*b6{^H83(VUghHA z6vL(wT@x}NY)HVFGiQLQ>i_ER-+%14va%9GRzQdi4@8(DzkdDRM@SR0JVsQRn3&W9 hQ(FVFB3x{ccL5C8TUy$~7JvW%002ovPDHLkV1gV%k@5fl delta 259 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 R4fg;5002ovPDHLkV1i{l+jjr} diff --git a/designer_base/src/com/fr/design/images/m_report/reportEngineAttr.png b/designer_base/src/com/fr/design/images/m_report/reportEngineAttr.png index 4ffcaba050a9ffb98f67b73bf872ac043a1b4367..7d1389bfd79aa35ea62c55bc107d784a0211104a 100644 GIT binary patch delta 386 zcmV-|0e$|&1DykqB!2;OQb$4nuFf3k00043NklJ!fXa%mgg$@-^c0D8zGDabh)=OB6i$j}Z*FJy5t-

PyrrrS|;bU;)*5CzA+Uw&z= zPge|zqBzvr+_C!`(DUXa7Hg%-52Esg1${QTSBeI{-`jzKGXhthK%D2(eIPnfs<+8` z5N{EQ>k4UB^LwrVw>>t-?8R~N3d9&y+caSDjg-?dkWGd)?-~R_@a%bF#0dqEckqOn z`OY1f^C(ItK)%mvez`m@WQHt1!88t!Q`Ss8e);is6GZn9j7wEE|&j7 gmSvwElD|KF1LahZj;F;a@c;k-07*qoM6N<$g5(Ud1ONa4 delta 426 zcmV;b0agB;1H=Q6B!3BTNLh0L01FcU01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DL zVr3vnZDD6+Qe|Oed2z{QJOBUzQAtEWRCwBAoHTXTe+Du^ZdNKI3y9(6=}fZbZQJ*P zX%=(=VgRy*EZ77|0bm1^6qU%(ispq?Yc_!Cu#f;a8y5hn!GG`qvS6_GZw4k&ZH8Yf zJi&ani0usjUSDNk)(pk&1!Nb1H2>LK!tkGgiGdL+_j83eko}M0^qF%Ek2uZoxZvj} zhQD{WF)%O!HUIwyR|L|`z{Jd8?itHqA){~mF;m^Ku1_r2RR+nBd27`Zp z!CpcSA0}iMIDgpN5Da@{=c5<^=15zB0}SL`5cs{P7>ps3%nU5%MGSwAcQE{%BF~`q z|02VWDe?&{=r({t8{}NDAs`y68N~kg`6{&@|3C4$86)IpAf*Asa)Bpeg diff --git a/designer_base/src/com/fr/design/images/m_web/datasource.png b/designer_base/src/com/fr/design/images/m_web/datasource.png index 4b8bd89ab45653fe064a8db8ee557d70bab59247..2ff090e33d2f2058ce87bf88e02bf54843fcfe6d 100644 GIT binary patch delta 414 zcmV;P0b%~n0=NT^B!2;OQb$4nuFf3k0004UNklRO zU`CS##ezW~Nf=X;`x_7l#IXDoBqV5pAwywG)q<#G0)@a~+IxJj?cK`QMlvqBzSr-4 z@5g<;68&?jYJM1oJJ!-E5qE%ZU^mM62keAMjkKoQD2iT7oPT_QRx7+ziq4tYxZpgi zl**WC7{}3t#PyWKgTIo6TX1;b@_YfU)fvFC3oNnYlABWkN5oitV{|9W%sNrJK!adp zO!jUqUnB2Paw{6_G2TCM#s|PpO7R48jwB*BV4)ug)x&@sh|7@zu>emXf?_G3 z>VcR@Mi?Z*b1fq@D=R>q?tmv_U4$m43Ba5PN=ys@0R{l`R66HBZ08aH0000G9wvZ8 z4~npfi7AlJ_#Q4uie{K5n4W0i$8AQBqRS1IB$HNHa)`k&$6JBjf+MAU4zs3|nE*0un?9 zjEqb*_wGIX1X2`3(#%){G_VjTR!-30pj2mKVs;Z4$SOd?<|``7r>$PS`Y+59f(DqF rSXeVK{0V1bVw!U5)TvuAjW8Mj3m$bkMa$X200000NkvXXu0mjfpmUK* delta 477 zcmV<30V4kN0`~)uB!3BTNLh0L01FcU01FcV0GgZ_0000PbVXQnQ*UN;cVTj606}DL zVr3vnZDD6+Qe|Oed2z{QJOBUzgh@m}RCwBA{Qv(y10{eFn*l4%UvU6ZFl-MK|NH0f zdk}c@=ABYQR1hObj0K+t5cu-t>%F&c-U_|};-5c$3Ic@$k$>e`p!9xh&O3JG1c*|? z=LIGP3IWLmNPT>3!17t5SoIQP>;pfkvU^Y8DJA<*QAyxwtZ*O4`{Ph{c zJODJr0d4>;4KN_h`Hmq~aUa8mzjh2E7k4vo{QbobGK44>fHdc+>|o$z{>2b!aFSs; zgDXSKxvd|8Qhx>DbO4OT|F~iSSu+fL|I5a}>9CIxB@FJ|y36qD)oUEAc7*xj$<^;TY?lbgJ-WhV4MlxFzDAj!we z@bBl#e=6@An1F^PGT0tjfHi(W2B6~rAD_QRjvTpm`_7#S@6R@PVN(Oc009O7%xlu- TL6mvo00000NkvXXu0mjfvq08} diff --git a/designer_base/src/com/fr/design/images/m_web/function.png b/designer_base/src/com/fr/design/images/m_web/function.png index 5b85a0c7a51f831551aa212db8d3fc14244a0608..5f8119e09dd4bd2efa35f03cf120da55925fa2ae 100644 GIT binary patch delta 163 zcmV;U09^lo0>1%}B!2;OQb$4nuFf3k0001aNklVES=;1 z2!N`9E%g9esJ0fFpZ)_IS^zD82*sPi)PO4h7!a@OM*vjS1swH{8))G7{s10QFcYvK RGJ603002ovPDHLkV1gwCMFs!> delta 228 zcmVs;v2(@ouBq|JqGF>+^V55l+#COyE8L-hr z0Z>AMVLL0!|HynO#t95cUjJw0$ykds3_ec}V#F7S@K^vUWZ=zQhe5*>;mr#~xPZ2q eiDCl)0t^5}!D~PUK!d3O0000iA^b`Cx3*TFPFiQA^F3_Sj5iFqQ4m+2S}y{6Nt z@oKf|1qlEcN?7F?s@cGs^;XL%DrKz_d6x{1$77jhv*~`>LNp5xRco)pHk6z(&HNp@ zPlTBMfZf3mLq{kPdIUepxpx3a*#q&%%OOev zBpCqI>;R2YAx~(D@gj;qnpc zwE`fnhe`(m4OG~`f=4qfP(gqnh~HxghYd`4qPT%T8Zy9^4v=k^hxr}o)CMHE|HuX~ tVbLsr7V_w6;2@Ni2dQNo@Z1OxU;uRtT|77&0DS-e002ovPDHLkV1j5(gvkH^ diff --git a/designer_form/src/com/fr/design/mainframe/actions/NewFormAction.java b/designer_form/src/com/fr/design/mainframe/actions/NewFormAction.java index 78b17d4b3d..dfcc8805c2 100644 --- a/designer_form/src/com/fr/design/mainframe/actions/NewFormAction.java +++ b/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()); } From 8fb56a41f9221c802a1a9c16eddb7fa08812ff31 Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 25 Sep 2017 18:32:01 +0800 Subject: [PATCH 2/6] =?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 --- .../com/fr/design/images/buttonicon/new_form3.png | Bin 0 -> 278 bytes .../fr/design/images/server/platform_16_16.png | Bin 0 -> 605 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 designer_base/src/com/fr/design/images/buttonicon/new_form3.png create mode 100644 designer_base/src/com/fr/design/images/server/platform_16_16.png diff --git a/designer_base/src/com/fr/design/images/buttonicon/new_form3.png b/designer_base/src/com/fr/design/images/buttonicon/new_form3.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf9e82c6d970f0a96a47ba7d03060f337072472 GIT binary patch literal 278 zcmV+x0qOpUP)Px#&`Cr=R5%f>Qp*v-AP`*~52gVd30}Bage6EDVjHmpd$0m>vzmB7miTrU91%0- zvj6wqE>ZOQ`d$b4HLDak@BR6$rv-p}wBFsd)+Ye0;I!JV+w6(d0U)Y{nZa3l2;|1m zD`U)dnjSZza7_T5tSP9GG_PRoF>$aGCIsmk%wXXHe6FF0roG^e~OoY@QnPz cO8{8m6L9@dd*XEcLjV8(07*qoM6N<$g3>m3MF0Q* literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/server/platform_16_16.png b/designer_base/src/com/fr/design/images/server/platform_16_16.png new file mode 100644 index 0000000000000000000000000000000000000000..3c3c808339b2e1da5461478305e1027eed3112a4 GIT binary patch literal 605 zcmV-j0;2tiP)Px%7fD1xR5%fBQbA}FK@^=ot04q)@FJRuvIh^^OC?!h4Pp)o8t|e-@E~F z<$Rh?dH{q%5QN_$m=Z$FBv`R{B}cUSSta)U#Ro}Tokj;?7@bFKQx_|e@6T?blV?bL zS^2u{(;dd*qad!Cv0V?Pbqa(l`=KSQb4tW3%l+*21_z0@#~_*nJ{knuqllN{ znAI7xuI(g%_$t765P!&I_K$m>_e-ym+-tR()$Mj)!#^e^)j4PDR;5zOV*hj4@oGMQ zpweo!HWGn;CSnx2p%P#wo)C*KdB4AP5C2?{(z?}bHUnLh+*4wPVsC8w_!EU=P&@lw z@cmB6v`Q9z%eH|1x%vt8QcCZR(!RpP2~Bg roMGlT?pYL=$18o&>2$u~Ef}=FP|nkczO03M00000NkvXXu0mjf_h=Ty literal 0 HcmV?d00001 From 239be4dbde143bd06409bb37854087502ad2c472 Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 25 Sep 2017 20:14:09 +0800 Subject: [PATCH 3/6] =?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 83cf7a50d3..bccff1ad78 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 f1cd5f8740..c5e12fa69c 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 e6326aa252..c7cff45afa 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 b3fa73a26d..18fe7a83e1 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 From 301a3436e80287bad087a6a69168c70aea9fd9ec Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 25 Sep 2017 20:14:22 +0800 Subject: [PATCH 4/6] =?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 --- .../src/com/fr/design/images/.DS_Store | Bin 0 -> 12292 bytes .../com/fr/design/images/buttonicon/.DS_Store | Bin 0 -> 12292 bytes .../design/images/buttonicon/card_layout_16.png | Bin 0 -> 148 bytes .../images/buttonicon/layout_absolute_new.png | Bin 0 -> 138 bytes .../fr/design/images/buttonicon/report_16.png | Bin 0 -> 155 bytes .../design/images/buttonicon/widget/.DS_Store | Bin 0 -> 6148 bytes .../images/buttonicon/widget/button_16.png | Bin 0 -> 121 bytes .../buttonicon/widget/button_group_16.png | Bin 0 -> 280 bytes .../images/buttonicon/widget/check_box_16.png | Bin 0 -> 264 bytes .../buttonicon/widget/checkbox_group_16.png | Bin 0 -> 263 bytes .../images/buttonicon/widget/combo_box_16.png | Bin 0 -> 211 bytes .../images/buttonicon/widget/combo_check_16.png | Bin 0 -> 212 bytes .../images/buttonicon/widget/comboboxtree.png | Bin 0 -> 204 bytes .../design/images/buttonicon/widget/date_16.png | Bin 0 -> 191 bytes .../images/buttonicon/widget/files_up.png | Bin 0 -> 709 bytes .../images/buttonicon/widget/label_16.png | Bin 0 -> 359 bytes .../buttonicon/widget/number_field_16.png | Bin 0 -> 401 bytes .../buttonicon/widget/password_field_16.png | Bin 0 -> 306 bytes .../images/buttonicon/widget/text_area_16.png | Bin 0 -> 365 bytes .../images/buttonicon/widget/text_field_16.png | Bin 0 -> 113 bytes .../design/images/buttonicon/widget/tree_16.png | Bin 0 -> 225 bytes .../src/com/fr/design/images/control/.DS_Store | Bin 0 -> 10244 bytes .../src/com/fr/design/images/gui/.DS_Store | Bin 0 -> 8196 bytes .../com/fr/design/images/gui/color/.DS_Store | Bin 0 -> 6148 bytes .../fr/design/images/gui/color/foreground2.png | Bin 0 -> 2970 bytes .../com/fr/design/images/lookandfeel/.DS_Store | Bin 0 -> 8196 bytes .../src/com/fr/design/images/m_insert/.DS_Store | Bin 0 -> 10244 bytes .../src/com/fr/design/images/form/.DS_Store | Bin 0 -> 6148 bytes designer_form/src/com/fr/design/form/.DS_Store | Bin 0 -> 6148 bytes .../src/com/fr/design/form/images/.DS_Store | Bin 0 -> 6148 bytes 30 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 designer_base/src/com/fr/design/images/.DS_Store create mode 100644 designer_base/src/com/fr/design/images/buttonicon/.DS_Store create mode 100644 designer_base/src/com/fr/design/images/buttonicon/card_layout_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/layout_absolute_new.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/report_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/.DS_Store create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/button_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/button_group_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/check_box_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/checkbox_group_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/combo_box_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/combo_check_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/comboboxtree.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/date_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/files_up.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/label_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/number_field_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/password_field_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/text_area_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/text_field_16.png create mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/tree_16.png create mode 100644 designer_base/src/com/fr/design/images/control/.DS_Store create mode 100644 designer_base/src/com/fr/design/images/gui/.DS_Store create mode 100644 designer_base/src/com/fr/design/images/gui/color/.DS_Store create mode 100644 designer_base/src/com/fr/design/images/gui/color/foreground2.png create mode 100644 designer_base/src/com/fr/design/images/lookandfeel/.DS_Store create mode 100644 designer_base/src/com/fr/design/images/m_insert/.DS_Store create mode 100644 designer_chart/src/com/fr/design/images/form/.DS_Store create mode 100644 designer_form/src/com/fr/design/form/.DS_Store create mode 100644 designer_form/src/com/fr/design/form/images/.DS_Store diff --git a/designer_base/src/com/fr/design/images/.DS_Store b/designer_base/src/com/fr/design/images/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..68d64fbc869d2a67ff99202c17c07f37940271f5 GIT binary patch literal 12292 zcmeHNYit}>6+S1iotd#ykJ~tov)RVf4NaT4^<(42#ckGhOyefOCU#;w4?D9v*Y=R{ z%ywpWH;)FnMIb<^sDOk-6M@QGMd}Y!34sI>&{BzthlqGd1tk9Qhl)Q?As*-6JG&mw z+9HG!)#+Yo=DyCEo%!~jd(R61a4>In0qh05#3sH+221gZ$Uoe@xhOSMJCAp2rZy}el-3-8nnM}^M{GhY* z*SKM0O>NyKMb+w)!|&A&&+2y;ELI%N1(xghCzpEi|W!=R^<^=wXNz_LTKN!t1hnc5&cgSOOHz#~zKVcgg zW>1{A9CNZD-*>_>7TFn2c+54eIg6Rsx3+9+-JZ~rCy0z)I8n6BU}4(uv&=CqXMVC^ z`Buhe`lcq_t15zeXInC? z&*G=>)A$*@hR@>{<$G=5>x`EXS(Wbi4LAws;SxLx*Wg9?4!jDl!=K?z+(hqm54}qY zAHjoo7~hY_>G%0>pO(DkC-T!LQqZK11{uiHSrmvhZOOG=82238b>?ZFzfEk#XNrEf z;^D8AD_*T{P#YQ>&W_X49uJHl?++T@Y2F(%f`yFX&FVYGEt64ek}sDD<_z1cz?@O< zC@n2XI^nuD5eT*kBXg2uV^-fXoRs_Of6D zEd3P%1sYRg=e;DW-m3^y5qL)m^x>J%nyth2ZmCg%E|>WCw_`wy;iz z^^&XwEAa?cswFFiCI(7&8gJv|RHwswN!F4bP_hGtzl@=Ug5uYSuT78xre$5dR}rWp zP>Dbb4aGE}n4VNedgKMtBn`3-%!rosxAmhXCCXY-cW3Xin$)|mYZW!=6$w&VO=^mP z_9N=Az$AuOJ=mmmx}?<##9)r_V_>g$HPDG+SO<$ROQ@M(L9pJD z>)zkBjNHE7)J-C{0+Utonj^GqU=h4tE6M1u%CjWM~qCghH_vbBw$R%LC$Zk9mwa;(4QUb3O~EBJFAJs>^z=ZI8LW#eI0wXN2o6 zV2dNpoV%ubZw1fPwBdP%GtUMuo)zA;QD@K%0(Y_Ov#az7wjX>$3U_<@NU0I}vvg=L z$-ScEgyTAlyjx>(OeG^>4-CMuh|}onE1X993a8NsIjzRXb#zLymt96XNovGatu3n4y_FhVrQ%lB>26Ge zYfnGjFIHYzm0Q;3R#D}u@xNkdh2N6+U)-_99bYk5pzRli!Zd)-mV_dj29OweTsyj^ zo$!B619+jKIeE{!_jK-i_~4=IG9y6KPEq*O33wFWTPtiY0_HrRu3q0P1O17$NT>1{ z>xsM-T-4hslCR&$q903zt*Qv4nQeMK@Rq7k19Oppq%a?hX)cvJoO-!`yjq~YEmnbg(5`2%;uGiqF@H5IE_$~Ya{se!4zr#P^pOizOpo;a_ zAR_kdcrSKhALS18Q{;Y-46vj4J{+ak{aKvBb7)ZBKn|ZkpYjHt6!`)l!;e$8z*Wi? z_&k0AU&L?W_wfh#Lwp&3g1^A)^5iO;ZpUQ5bjR0kBuc*Qg{s>B+_%7e0fZnw`>E{a z@&Dnq^Zx`<^;SioioorO0M;BDKQu_+7RJ^qzLLk<+vqw+7cZP{N!EgeZeciH%!yDu zjdc= literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/.DS_Store b/designer_base/src/com/fr/design/images/buttonicon/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..50298defdf58b7c2149d659efdedba5a310d494a GIT binary patch literal 12292 zcmeHN&u<$=6rM@a){f)EBq`yC1V&Y%hk}x{swz-Llm=B15{>Grv}%j%ADhI&-nG{2 z{AdV@gervi1IhtToDdiO2#`1+^@KRVvEqOb5*KdpeY5Li#+h-;g#+D_iLnGKR_|#gH)^&x?uNLQ?L<4-K0oFsF zZO4BE{3lvgo)sp*>6PwuESXFIp2}jN4w?JOf{GUsZ zHSCH+u09ZNfF=4~N(NTiu;{8Ec99I0&Og{%>gXD*H^a!m@-A+tbq!3sCmv4d&YVvC4yFr9qulkdP!>^rLmB=~B`k3zEthI?R)qkqUV12bV@ z$P13Bmct?#ZlH4t9jSiB4z3+VRvM@&pva^M^;{PvoU!*W!aL6RL{1u7@{rvIFFo{H z6&eDx-0CNC(m+mV$Qo>hs1IvkMU$5XTDMzA|IlA{Bp7NSb-Uzs7xiXuS<#BA-)np; zXtnOm0A1iK4m{bXh0xQgAjf0WQioVbaY0I z73cU@OxESI7%7Y{jMUcpDIVGpZ9777PDf;*osryOK`~92KdMK}OIKEAyPb${O-95! z(8Kvl2t&qa8*`MUl@W_#)$1>S$CY#UPF0BWf zrKl2hJByX@rux;Wd)4IrY7jK{?<>`74R5ntn7$bJQKjK~p(cLo-G*NeHW!1gU+*YA zE0t&+SY@bOcz$Q+)w#20&Ydovot@h~UEE22%+2raW->D;=PoSYX>H%#`C#|M&(UTa zGD-6AR>(ZQz)z!{joL=iPI<4_&R_Q1Ihq^Gk53eynwXrJnwmcT^vp9e<-%08QhR?b zWNj}7%^+NCcD4OJK-KEg; ze5LR5>T1V}u50%O%;Z@{aU+fgI%JJ-ChgYrft3@iScx43<~S*d!> z%l={zMM3L&qZasattONb{9Fk=Dmd}xAF-ECEWF*j;rl!s1#u$2!7g7xUiB+2FMDEP zC4QDg%6$@{;){T)rS*lrPDbQ z=((QyxRiLMXm(I@ZLU-cT5V0v=)hL6v{dg#H6ecd{r+!Cs_*~xf&Xu>57xg?3jJo_ zuR$~GoYMy#Lc28>sIaaN)iIzLpcu{vEMU3pFv8TRhI80rC?7tr4dY{&xVW^l){F~Y zLt1lddYgLS-+O@Z;TYx{z8SYtjx)EB`;8^iWz6?+-fG2>ss^tA{rkW@1_PN(EDp?x zxkfNhllv%U7I8LR#yXU_%C^0&TsIgxMxleb-GD*Qm4kuFBpAmK=DNX<&q97+?#Pvc zfuJXQh+fua?E?lf14&Qzkjy;oD1Ih9`?~IfZEb~t1zMx{Nj?X_f(-3E5M(gb<3z9uS{(54|&O1)shL0w# zS{MtsGPnAGoHuGRrgS{APt{(O-h!<16PFu~T!M@>EFBmoP!S^FLah%HG@)nW>$M=6qD7~Z}NImfX^ne^$DlILdZN03%znOg3Uc`9^XYYWl z634~(2mrs;t9X>jW`Po1AP&#=;u3c_{_~Fj()k|~g>rpX&CTijuYFbiWX=Eo0Mm1^ ACjbBd literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/card_layout_16.png b/designer_base/src/com/fr/design/images/buttonicon/card_layout_16.png new file mode 100644 index 0000000000000000000000000000000000000000..1b9a5df8fa8e6522db8084bee730eee8c30889eb GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|{5)M8Lo5W7 z6BY;fD}d&7i;gasCg k8xNdmYSrrTH;W3Eoa(0l`kupD%c5cQm}l}Xx{M1 zfu&m7R_wyh8;97Ir9C*DaD|nJ=ZYu$jYl&h3>lV9l6bn?NMIGv0tQc4KbLh*2~7Z6 CayDlG literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/.DS_Store b/designer_base/src/com/fr/design/images/buttonicon/widget/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..91dc347ec85f31a94b7fdad753b39c905c453a5f GIT binary patch literal 6148 zcmeHKJx>Bb5PgdjC=GU&`wP6#SYHTshQ`o}!r?&-A2|+9tnT0V?<}o-GrJ+;sg*Ir z%v^Tf?(EDC`}T6f0&u-;)&)8MT5N)iW2!Gi=B3r75iNpF*BGIT3!Gz(WzE|Rhsc1O zT^l6|O!<5~zkFSeueO`ApvMh{*l@m}PB6o>J_-7?ZScVO70*1uJ?1=l@tbnIB9^pf z>NQ8sx&4uNjxffZuAWdAn9yg!*oCfFe2PezVL|^~*Gw3@We&-|i6PX*D~1cPx#(n&-?R5%gsQ#%gAFbuUVBs$Oozz$*$zm=J5uyO#lo&m(hHCSN>vLo2x0Bxnx zp(alqI#gAMO0Zxla{TOP%Z|h3#F)u~Sp!uaGV@K918dI*`07MJCdziqwD$c@7aDes z*U^atl|^{zs?NhOdO^bmUQZ`tV@4q=gX{<$cOuVg_mbrOwD#&7GrkjPznqL8)?NlJ z^c=_W%;nm;z!kG>(lng{2MIxCa)Ag2mSwsZp<_M+J;4TEgjL@dt|qTgo%&mz#x498 e$^C_&FVY92v9gy2e^}W70000tF@ literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/check_box_16.png b/designer_base/src/com/fr/design/images/buttonicon/widget/check_box_16.png new file mode 100644 index 0000000000000000000000000000000000000000..1c505d3a5f5ac96952768611708348215b369433 GIT binary patch literal 264 zcmV+j0r&oiP)Px#!bwCyR5%f1U>F4yhXA9AiOJUg{~5f{O=4tZ*mma38E^^A=Fg^|Vau~|Tp#>SSqKqqtl`0*=+k&$ud znKLI27#o{_^%)zR-eO?*uZn31ujP)Px#!AV3xR5%f1G%+#R`u{(J7Xun#WMtTO=FAyyG+_)b3rO?Xvu7A#GC%_j|Nm$G z^Z)>gftuy5&(u`cQMi{JV*cl N002ovPDHLkV1lwuZI1u| literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/combo_box_16.png b/designer_base/src/com/fr/design/images/buttonicon/widget/combo_box_16.png new file mode 100644 index 0000000000000000000000000000000000000000..4554959ff389dc9b52865dfd2fa967dc8fd67bc5 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|dOcknLo5W7 z6C^%0T)c7PiM{K-1xFYr#Hn@VuxF(yrZjYRo_zBEzhu#btA<8KK9ynAHfadw8+;p&?h=W-qZI*h^7)z4*} HQ$iB}kW@+W literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/combo_check_16.png b/designer_base/src/com/fr/design/images/buttonicon/widget/combo_check_16.png new file mode 100644 index 0000000000000000000000000000000000000000..71380190ab2d111330a7ebd5e2c2c53d821dbbcb GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|`aE46Lo5WB zPP)k3pupp@^5gZ)1A9x@*e~qWFiz}iS>mCh`gFPPi@n+0Pijw`E7D=e2wz*t@$kgW zyDQX-)Q#;=TxH`vWZ3^tPpcP-hQ+c^ zh`q8XFlS!jHQ5Jj3U{||$YWW%q3#v1%eBwdKl;H*g+`l(=nhi}hBw!5yYJrjEwV$2 zXX%5t^BC9c*w!oig=2#fx884_fZ4wu^W3rj$ntlSc~QnOkM%$oF?hQAxvXv?{f$St!_3gI_V@q)^@?t8$I8>s%@JekJjh^Xx#8)Q9SlpRPZVN4 zux{}Yh6!BuJCTB)#1aE_45bDP46hOx7_4S6Fo+k-*%fF5l$a3U z6XFV_2NgK1*r5z`kbX&!Uob<*ncW#oDxnc?l$EBfWO+Jk&a2kdY>(L=HYC+lNf=MK z+b1U4+{pS;werE9a>iTVmR3&$YGq9Fc6VXuV3qX%aySb-B8!1Ei0#4Pb~4)z$Y}C( zaSV~TTzc-NP?G_V!^H#^7lDl@)ReS#BsBi}e}CeX!c*Meb(gUao|8m2{o!8~afns$vuZ)+CN|ZgaOSJMt9h=Jze{|uGT($P z>hI6%x2AnR{_*)frIZFg{iE}b$R$WTwOJ&?US-0V{gZdyy#-uiK-Z|2xJHzuB$lLF zB^RXvDF!10LvvjNOI;(=5F-OCLjx-#6Kw+vD+2?Y9SieOH00)|WTsW(*5Lb8@-k3E z6v&3+vUIDY#Nt%l(xOa;w9K4TD}8OyG{TA literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/label_16.png b/designer_base/src/com/fr/design/images/buttonicon/widget/label_16.png new file mode 100644 index 0000000000000000000000000000000000000000..023406cd8ca85659dfb51263a4ee4b2f9cfa5be7 GIT binary patch literal 359 zcmV-t0hs=YP)Px$AxT6*R5%f1U>Nd%(b(AJKSjQP8DMOj#%gJ4$%)M{Tyh}2OfU_Mj29h#{rZ~+ z<0I3|%om(~|NfnWECyqI3b>>vU(0PZ4?Udj^^x-CPG4*+XhW<#L-pp5_k002ovPDHLk FV1i>`oMHd~ literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/number_field_16.png b/designer_base/src/com/fr/design/images/buttonicon/widget/number_field_16.png new file mode 100644 index 0000000000000000000000000000000000000000..19b688df4330dcc31e4770867310ba7b2114eb07 GIT binary patch literal 401 zcmV;C0dD?@P)Px$OG!jQR5%gUQZY-zP!N9ilEyl85J7Zw)HO+k(7(_QLfjq1NkLr|vI*kk=Hy_1 zfKZ)WIs^)70v~veiYf-IwYhq$ z)mqB)$ra-2ewOvVf*@EaisA+lCPcs1>&|f;$Dh96yh9WvfLOFFd8kw=Bpc*;u}8#K zqw!(xj^n%|u7z1P+$Q>k%sK#owVJ)l7#Vbx(jC?sL7FBPLg1JIj()$Nb0>Tz-3BGY z4F-cZ&ubo0v9@i?F7svtKKvD~>z|PEXh<>Rr4$cZL>A^HHKkm@rI%(GM%%w`j5md&UbtRY4VN&9wf5S00000NkvXXu0mjf|L?Ml literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/password_field_16.png b/designer_base/src/com/fr/design/images/buttonicon/widget/password_field_16.png new file mode 100644 index 0000000000000000000000000000000000000000..e6bc2977238df6450955058b3312794dbd4340dd GIT binary patch literal 306 zcmV-20nPr2P)Px#>`6pHR5%gUlCcWHFc60Ca@_>cStmDVrRX5^VI15Dq2uh*N`KO96&_O&%LjL^s<&K2t?}J;dwifE52*Blds#*eW?NO2 z^W}0nKx3IZ9iJu`K{F1=7A~+v#!E0JVsH}#C}Y~Wq?aT5S;J# zM;+%A=r!ilVx_zVRTf16p28sR769{=NHYvck_3|dYA(n5a)1c$na$J~p2M|41)zIZ z5i^3e7LjEf$4~fgD7_Ew&hyO70qEziQ2Zn1ef;(G0@W*JdPx$CrLy>R5%f1G%+#R`u{(J7Xul9k&$5=gR!y6e=_ufwSe?8!898in>L!5SXjgO z=(LH6={#d&8##1w7MK9gIe!2D|1k!7>EQqWj9(ZTneLo9b8@$diCHTH!@uP~Z`v?0 z{Oktucbz$NYA#G4+yy`dn;02c+RvOh(=9A4xQKz_Zxzt6Dn`ctPk~}rfEFBKU|=sr z)(kQPZUD?g5WQ>HuCG9;SwKV6xw*M#A>CWhKVI@IMmh zjoQzjzqUg({eQ;9^b;(PYzW){CMJe8|Nb%9-Mja&8qRB literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/text_field_16.png b/designer_base/src/com/fr/design/images/buttonicon/widget/text_field_16.png new file mode 100644 index 0000000000000000000000000000000000000000..553a9084607ab9ba3b44805fc60fb4246c2815cb GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|v^`xMLo5W7 z6C^%0T)c7PiM{K-1xFYr#Hn@VuxH7cCK$9ZKIQDZRATVq7h}*Pw$j_umH|L*44$rj JF6*2UngD19A{PJv literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/tree_16.png b/designer_base/src/com/fr/design/images/buttonicon/widget/tree_16.png new file mode 100644 index 0000000000000000000000000000000000000000..5e442d2d826a27075c1b85344ab59736ef324fc2 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|W_!9ghFAzL z4R+*fP~c&H-2X)MUwFJ?{-KZ{W430N9aHkM!#%$!wrH!C@9KQKclX`G7L$d4RW7`n z79n-~M@4qtW~mk5TdtJyrf_kY%woIacg3mbas#unj@(AkouQLgaxv#j_AQV&G0QCG zU(5Z5b1r%B6|43$cJy%dEzX`L&Q?@C?Ya2_*@&|ttd_ProTF7F&Y0h}t~=Q(a-Dnc XL)$yzfnjPuXEJ!Y`njxgN@xNAj5Aag literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/control/.DS_Store b/designer_base/src/com/fr/design/images/control/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1fa5734c3947354792e29bc699c56a3fbba46045 GIT binary patch literal 10244 zcmeHM%We}f6uoXDI(bkbSRi(@EDI2@MW9fX1v?}@AS8W@G*h){DZ6YCzrZgbK8BBB z!w$~5VfGJ=K{EG_Unaz?7%4kPZz!WeARtj)_$Wa+bJ}%3sQwI*Z z1VHTKvKE|U9iW`t$B~cAGAb2qma7Nnsm?DkTuI00IpK&SAD3k;>EcSdIG@@16^hgB z;N=PzH!7nYO#xG&sQ}mRLz&1fUau?b_qiOrniV_KSuq8M!|EyO=1(m+6WIXo6t6Uve#$)hBHp^tLrr|rbLyfHKUjHmSB}uv zaqrPfan>A~C;HaWQE}D@I4M`r5g{uBlJ}NSOx+OTH&*yD#@?YaQ@QBiD)$iV8OGlj zz1r&j4&4-TZz9)kF8BQCq^O$eppcm%)1K_7zG0UR3h~1gzLiHWxh(L~V8v_cH99K6 zYUwrls>0%TDxl%JxCWe^YWQPyQlh8mr3!wa4%*k_8I+GIy#_B;SbfDa6X&Ej2cD>K zdf*(%0dllBu)-Jyj25Nopd_zFYx<|c+X(Vqaj*1Jg*(8Q=LlZN3!Lr5HIe6F{Ro`Y z0e&LW+Ov?(xeQQ!?0e6z@Bw`ja&D~l%9~F>dM3p76x%j$(KSs*OP{D?nv9m-;8U=Y zBg3r2-vEix&-to?$KbYN3YY?>fGJ=Km;%?TK&Q-}bN~Nk`v3oHy+=!K3YY?aRsq-D zezU!W9DZ-Tk&S!pIqF+f7UGs=R0*tAh`)Ta1w|+ZQ9%*>=P&V>B0kRSY(gH*4?#509hf;Y z=P@(;&3AWlHUNMvX}uPp1OOzeT&j80+@Nqfuggl7ugM{a6c3O}Oga+@(@re&4HN+a z0RjO60RjO60RpQ70lKq!kyg0(g*9jc1OfzZN(A`(AwreQs4r)P^j;m*cqsr$o&tD< z`jiKFF%e%zeK{kf7fN%A>;e5y^ivEJ;bf0+cal+G&Il>O0Yx~VzcTt63VN$kT*Pw+ zj0zdF0RjO6%Msu|pIk_S4JOrv`TMVl3Da=gnwqaMD?2B5&00y8^YZ2Vg8UQRWAj zFD^$!$qRKHQaa;mQHGwQYr-{b%jsn)hh$tWa0r@?q-`BdF>dcm+Gcv(a^h-XQZtij zlR#-U&2Hln=JdO4%H_R5$4Hu)lZJHK&JkPZGwPltR2Hg`q~l!Qnqt%n zwNe?{Caanhb7Q z#|!u}zJjmfJNQ0+gdgK4_$hvYU*fFTU)CI9kNErb1%5}J#f0@g!DS8Kh_K=IdzFL# z4`IK_=PWHOx~+KK#`4PQx;;(J^9Q-)>=x3tCicpn^NyWLSj{D(3Tu6XqNq8|6rRR2#KOn% z349ixBPPB;OuUG%E#Y0q65d^2%)3l?$}(+hl(ch9T^taMRv7}>Vm~E3|8HOU`~NE2 zb+DZPfdGMj69LR=>uzhI8CQC5^ISVZb%ZJ}+;2umFN7K|9Vh9f<0R+*VMzT5x$>B( bFK2`#4VC}=Lje749NhoG{qK?QCT{))k%0Ba literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/gui/color/.DS_Store b/designer_base/src/com/fr/design/images/gui/color/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 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 N-~YN6vAH}7`~om-wRr#l literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/m_insert/.DS_Store b/designer_base/src/com/fr/design/images/m_insert/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9e5b4ec081f94259acef48314f98934719c1d6a0 GIT binary patch literal 10244 zcmeHM&ubGw6n>NBuwj!>@E}Emy$D4?6ugNTVm$~RO6|=d4;U0B>V6wut3%j&dpy<<952k>cqQo#3j^8tOhiw;jX|08m zv2Zd)WK&cqMxq0ki94CLwR%+sl!40(aP6K_mkx2{Uj06JHp~wXhWPT z?)aIH+M{FC{zK{)^?!)}9N<$rKo1j%+bctv>j5eO>KM3bJc>CB{2SswrXD>(j3ExY zI}v1OegwFdgUf-M(+GPSQEa6fVC%pRk>i-&05L$mM?RO8uK|L&$Z;@xjElypJ_=9? zxLff~)h~g6df~r=SSRr)waoxk2kNzq)cMX%z+LSl5ND1unlh#%M948ttco&Cu%Pz|0Y)gd5S7i)sP0 z05d$wt|ntDVO_b{I-(8ncARBYA(h+sB5yi;HXOtX9xLAwY3kro;BqiIl6ULIqlv!U z{94dDvp>iCUBSMn%*8gLv3J1r(Zh3S#?BqyM-0?feTk3zHz(IRyhq?BIYq8O2)jBDQD;G2bH6499O> zM^wX#^RNvtdMpun9xh6?1GRa$I_56VdmfXh+Jx7I^L95K#6Dt9aqtRYSE)Yk_7R=4 zVf7En=O(X@UM?+Q&vV%aj`dNJ6|a&jusK-lqKD`kv7$ZfH81W2F%O0RmD#hly4*Dzh z)-UzUd+iy{S2($`-_lxv;3C`cu(BPGKX^NS3n%;DW6KTq?ZPgt#S^rD{?7oeAGQAX S_IG&~)2mvw{wMm6>;GR782=9d literal 0 HcmV?d00001 diff --git a/designer_chart/src/com/fr/design/images/form/.DS_Store b/designer_chart/src/com/fr/design/images/form/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..83d87b9ad453939c71a644c41d18346140232455 GIT binary patch literal 6148 zcmeHK%}T>S5Z%_oBMr~^{a7DO&{ z_{?Le-)Wxt@qjlOej@|;?nYV01Y9wD^ZtYnGtd5695u70r6*n(Dh`i~8m2i`GE3v7 zL$@J1ZsujJX4OmgakTAa4c|-a)~p)^A@ug5AZygZWFrpSVX~EOdReGkYeK}}Aj4{& zzZ->}x;42blFW;eFqOGgj)T1@2}GwVT1n89{yMo~%sJt)q|`Lbx;4}7E|ym+s|)tZ za;3LmclDsW-0PXf^n7LK==A*J^6L8L_U`^c#xV|Gt&|CkeRzb<2Ugl{n#3YGfth|( z-wpG-A922jhyr~)OCZ`B z9gVp{m;vD`6i|h7eZ=4@9PGCCb2R1(RXF2vWyqsf=K6%f%hZdt+hdqK~c~zSNIwN9a)OO7fbOJ bs1&f<*a37j<_f_ALO%kM25N|bA7$VL2@GQ& literal 0 HcmV?d00001 diff --git a/designer_form/src/com/fr/design/form/.DS_Store b/designer_form/src/com/fr/design/form/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b39c40f4bde105eef0cba316a14a2cf79b544a6f GIT binary patch literal 6148 zcmeHK%}*0S6rX_#U8r^oR6#jx>_HPS;Va$@Yk??1(@GmC@=>diMF6>Bx|WQ^=fW`1wqy!U43H`#eR2qB!Tmc|j%5kg^T z978?O{X+OSZ*9_{ES-Q@s+Y9fRsNK={Oy9}=Jnx>T_T_@+a-TH zOX!?KYJ{fT8P*A0nw)&p_3y0o^hQpeit4ex{@6e)9*>_s6CWHpJCxV^ z3s!Nb?DE&2VGeVXPL-^dUAvU2SVfzbb3VE2XY75F*ZY2QT_mNABU5&-0zLyr29fTX zO9&PDQd?Ud@pC`uD|tQY6A#aJe9$;Hc zZpCt4i(6 z1FM;_x}jh(JLETnJHn>Kpbr=b7-(gH|NDdJy#CMq{{AnVf-YbnVBr5`0EcEXvq@N+ zs;zCS8^*Hs~j7 zqqRX5PzC;)0{rdn(E|L@UW%%yB?AjQN zj{^I!#O~1;+&9FT(HY_-5^d^_Wmbq)oXJ5YR*G0Ndd6xJe}vk#CqhO`%sv5^RoJo~ zbBYL`h4r++DM#??5S&ypx3SWc=FpI5n{3M)9D%qR=8Zz87G}wBX^D&@%z5GGg_BCQ7DlGqXBoa%cz9IXi2^vY+3LIpsHp;~ zfGSW_fcJ+8&KNt)Ey~t`LaqS75Y1w!^PdLhL=IzzxkdEAjHLoC)wnB$v2?UYZd~jz zw`l2PBs1c;%*NeNjATc9B*V$X7PV9bRDrSrfqiWA`G2$d{$D2PlPaJJ{3``a*uCp^ zuq1c3t}Tww+6aCRXXA0XMWLW@$FWrSC_aXZp)cYJFm{+*L<>y+2#5??r~*4x;1@Y> BxD5aR literal 0 HcmV?d00001 From ba21d74d573b80fe4571261ffb8c15334847edc8 Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 25 Sep 2017 20:14:38 +0800 Subject: [PATCH 5/6] =?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 --- .../src/com/fr/design/images/.DS_Store | Bin 12292 -> 0 bytes .../com/fr/design/images/buttonicon/.DS_Store | Bin 12292 -> 0 bytes .../design/images/buttonicon/widget/.DS_Store | Bin 6148 -> 0 bytes .../src/com/fr/design/images/control/.DS_Store | Bin 10244 -> 0 bytes .../src/com/fr/design/images/gui/.DS_Store | Bin 8196 -> 0 bytes .../com/fr/design/images/gui/color/.DS_Store | Bin 6148 -> 0 bytes .../com/fr/design/images/lookandfeel/.DS_Store | Bin 8196 -> 0 bytes .../src/com/fr/design/images/m_insert/.DS_Store | Bin 10244 -> 0 bytes .../src/com/fr/design/images/form/.DS_Store | Bin 6148 -> 0 bytes designer_form/src/com/fr/design/form/.DS_Store | Bin 6148 -> 0 bytes .../src/com/fr/design/form/images/.DS_Store | Bin 6148 -> 0 bytes 11 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 designer_base/src/com/fr/design/images/.DS_Store delete mode 100644 designer_base/src/com/fr/design/images/buttonicon/.DS_Store delete mode 100644 designer_base/src/com/fr/design/images/buttonicon/widget/.DS_Store delete mode 100644 designer_base/src/com/fr/design/images/control/.DS_Store delete mode 100644 designer_base/src/com/fr/design/images/gui/.DS_Store delete mode 100644 designer_base/src/com/fr/design/images/gui/color/.DS_Store delete mode 100644 designer_base/src/com/fr/design/images/lookandfeel/.DS_Store delete mode 100644 designer_base/src/com/fr/design/images/m_insert/.DS_Store delete mode 100644 designer_chart/src/com/fr/design/images/form/.DS_Store delete mode 100644 designer_form/src/com/fr/design/form/.DS_Store delete mode 100644 designer_form/src/com/fr/design/form/images/.DS_Store diff --git a/designer_base/src/com/fr/design/images/.DS_Store b/designer_base/src/com/fr/design/images/.DS_Store deleted file mode 100644 index 68d64fbc869d2a67ff99202c17c07f37940271f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12292 zcmeHNYit}>6+S1iotd#ykJ~tov)RVf4NaT4^<(42#ckGhOyefOCU#;w4?D9v*Y=R{ z%ywpWH;)FnMIb<^sDOk-6M@QGMd}Y!34sI>&{BzthlqGd1tk9Qhl)Q?As*-6JG&mw z+9HG!)#+Yo=DyCEo%!~jd(R61a4>In0qh05#3sH+221gZ$Uoe@xhOSMJCAp2rZy}el-3-8nnM}^M{GhY* z*SKM0O>NyKMb+w)!|&A&&+2y;ELI%N1(xghCzpEi|W!=R^<^=wXNz_LTKN!t1hnc5&cgSOOHz#~zKVcgg zW>1{A9CNZD-*>_>7TFn2c+54eIg6Rsx3+9+-JZ~rCy0z)I8n6BU}4(uv&=CqXMVC^ z`Buhe`lcq_t15zeXInC? z&*G=>)A$*@hR@>{<$G=5>x`EXS(Wbi4LAws;SxLx*Wg9?4!jDl!=K?z+(hqm54}qY zAHjoo7~hY_>G%0>pO(DkC-T!LQqZK11{uiHSrmvhZOOG=82238b>?ZFzfEk#XNrEf z;^D8AD_*T{P#YQ>&W_X49uJHl?++T@Y2F(%f`yFX&FVYGEt64ek}sDD<_z1cz?@O< zC@n2XI^nuD5eT*kBXg2uV^-fXoRs_Of6D zEd3P%1sYRg=e;DW-m3^y5qL)m^x>J%nyth2ZmCg%E|>WCw_`wy;iz z^^&XwEAa?cswFFiCI(7&8gJv|RHwswN!F4bP_hGtzl@=Ug5uYSuT78xre$5dR}rWp zP>Dbb4aGE}n4VNedgKMtBn`3-%!rosxAmhXCCXY-cW3Xin$)|mYZW!=6$w&VO=^mP z_9N=Az$AuOJ=mmmx}?<##9)r_V_>g$HPDG+SO<$ROQ@M(L9pJD z>)zkBjNHE7)J-C{0+Utonj^GqU=h4tE6M1u%CjWM~qCghH_vbBw$R%LC$Zk9mwa;(4QUb3O~EBJFAJs>^z=ZI8LW#eI0wXN2o6 zV2dNpoV%ubZw1fPwBdP%GtUMuo)zA;QD@K%0(Y_Ov#az7wjX>$3U_<@NU0I}vvg=L z$-ScEgyTAlyjx>(OeG^>4-CMuh|}onE1X993a8NsIjzRXb#zLymt96XNovGatu3n4y_FhVrQ%lB>26Ge zYfnGjFIHYzm0Q;3R#D}u@xNkdh2N6+U)-_99bYk5pzRli!Zd)-mV_dj29OweTsyj^ zo$!B619+jKIeE{!_jK-i_~4=IG9y6KPEq*O33wFWTPtiY0_HrRu3q0P1O17$NT>1{ z>xsM-T-4hslCR&$q903zt*Qv4nQeMK@Rq7k19Oppq%a?hX)cvJoO-!`yjq~YEmnbg(5`2%;uGiqF@H5IE_$~Ya{se!4zr#P^pOizOpo;a_ zAR_kdcrSKhALS18Q{;Y-46vj4J{+ak{aKvBb7)ZBKn|ZkpYjHt6!`)l!;e$8z*Wi? z_&k0AU&L?W_wfh#Lwp&3g1^A)^5iO;ZpUQ5bjR0kBuc*Qg{s>B+_%7e0fZnw`>E{a z@&Dnq^Zx`<^;SioioorO0M;BDKQu_+7RJ^qzLLk<+vqw+7cZP{N!EgeZeciH%!yDu zjdc= diff --git a/designer_base/src/com/fr/design/images/buttonicon/.DS_Store b/designer_base/src/com/fr/design/images/buttonicon/.DS_Store deleted file mode 100644 index 50298defdf58b7c2149d659efdedba5a310d494a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12292 zcmeHN&u<$=6rM@a){f)EBq`yC1V&Y%hk}x{swz-Llm=B15{>Grv}%j%ADhI&-nG{2 z{AdV@gervi1IhtToDdiO2#`1+^@KRVvEqOb5*KdpeY5Li#+h-;g#+D_iLnGKR_|#gH)^&x?uNLQ?L<4-K0oFsF zZO4BE{3lvgo)sp*>6PwuESXFIp2}jN4w?JOf{GUsZ zHSCH+u09ZNfF=4~N(NTiu;{8Ec99I0&Og{%>gXD*H^a!m@-A+tbq!3sCmv4d&YVvC4yFr9qulkdP!>^rLmB=~B`k3zEthI?R)qkqUV12bV@ z$P13Bmct?#ZlH4t9jSiB4z3+VRvM@&pva^M^;{PvoU!*W!aL6RL{1u7@{rvIFFo{H z6&eDx-0CNC(m+mV$Qo>hs1IvkMU$5XTDMzA|IlA{Bp7NSb-Uzs7xiXuS<#BA-)np; zXtnOm0A1iK4m{bXh0xQgAjf0WQioVbaY0I z73cU@OxESI7%7Y{jMUcpDIVGpZ9777PDf;*osryOK`~92KdMK}OIKEAyPb${O-95! z(8Kvl2t&qa8*`MUl@W_#)$1>S$CY#UPF0BWf zrKl2hJByX@rux;Wd)4IrY7jK{?<>`74R5ntn7$bJQKjK~p(cLo-G*NeHW!1gU+*YA zE0t&+SY@bOcz$Q+)w#20&Ydovot@h~UEE22%+2raW->D;=PoSYX>H%#`C#|M&(UTa zGD-6AR>(ZQz)z!{joL=iPI<4_&R_Q1Ihq^Gk53eynwXrJnwmcT^vp9e<-%08QhR?b zWNj}7%^+NCcD4OJK-KEg; ze5LR5>T1V}u50%O%;Z@{aU+fgI%JJ-ChgYrft3@iScx43<~S*d!> z%l={zMM3L&qZasattONb{9Fk=Dmd}xAF-ECEWF*j;rl!s1#u$2!7g7xUiB+2FMDEP zC4QDg%6$@{;){T)rS*lrPDbQ z=((QyxRiLMXm(I@ZLU-cT5V0v=)hL6v{dg#H6ecd{r+!Cs_*~xf&Xu>57xg?3jJo_ zuR$~GoYMy#Lc28>sIaaN)iIzLpcu{vEMU3pFv8TRhI80rC?7tr4dY{&xVW^l){F~Y zLt1lddYgLS-+O@Z;TYx{z8SYtjx)EB`;8^iWz6?+-fG2>ss^tA{rkW@1_PN(EDp?x zxkfNhllv%U7I8LR#yXU_%C^0&TsIgxMxleb-GD*Qm4kuFBpAmK=DNX<&q97+?#Pvc zfuJXQh+fua?E?lf14&Qzkjy;oD1Ih9`?~IfZEb~t1zMx{Nj?X_f(-3E5M(gb<3z9uS{(54|&O1)shL0w# zS{MtsGPnAGoHuGRrgS{APt{(O-h!<16PFu~T!M@>EFBmoP!S^FLah%HG@)nW>$M=6qD7~Z}NImfX^ne^$DlILdZN03%znOg3Uc`9^XYYWl z634~(2mrs;t9X>jW`Po1AP&#=;u3c_{_~Fj()k|~g>rpX&CTijuYFbiWX=Eo0Mm1^ ACjbBd diff --git a/designer_base/src/com/fr/design/images/buttonicon/widget/.DS_Store b/designer_base/src/com/fr/design/images/buttonicon/widget/.DS_Store deleted file mode 100644 index 91dc347ec85f31a94b7fdad753b39c905c453a5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJx>Bb5PgdjC=GU&`wP6#SYHTshQ`o}!r?&-A2|+9tnT0V?<}o-GrJ+;sg*Ir z%v^Tf?(EDC`}T6f0&u-;)&)8MT5N)iW2!Gi=B3r75iNpF*BGIT3!Gz(WzE|Rhsc1O zT^l6|O!<5~zkFSeueO`ApvMh{*l@m}PB6o>J_-7?ZScVO70*1uJ?1=l@tbnIB9^pf z>NQ8sx&4uNjxffZuAWdAn9yg!*oCfFe2PezVL|^~*Gw3@We&-|i6PX*D~1cfGJ=K{EG_Unaz?7%4kPZz!WeARtj)_$Wa+bJ}%3sQwI*Z z1VHTKvKE|U9iW`t$B~cAGAb2qma7Nnsm?DkTuI00IpK&SAD3k;>EcSdIG@@16^hgB z;N=PzH!7nYO#xG&sQ}mRLz&1fUau?b_qiOrniV_KSuq8M!|EyO=1(m+6WIXo6t6Uve#$)hBHp^tLrr|rbLyfHKUjHmSB}uv zaqrPfan>A~C;HaWQE}D@I4M`r5g{uBlJ}NSOx+OTH&*yD#@?YaQ@QBiD)$iV8OGlj zz1r&j4&4-TZz9)kF8BQCq^O$eppcm%)1K_7zG0UR3h~1gzLiHWxh(L~V8v_cH99K6 zYUwrls>0%TDxl%JxCWe^YWQPyQlh8mr3!wa4%*k_8I+GIy#_B;SbfDa6X&Ej2cD>K zdf*(%0dllBu)-Jyj25Nopd_zFYx<|c+X(Vqaj*1Jg*(8Q=LlZN3!Lr5HIe6F{Ro`Y z0e&LW+Ov?(xeQQ!?0e6z@Bw`ja&D~l%9~F>dM3p76x%j$(KSs*OP{D?nv9m-;8U=Y zBg3r2-vEix&-to?$KbYN3YY?>fGJ=Km;%?TK&Q-}bN~Nk`v3oHy+=!K3YY?aRsq-D zezU!W9DZ-Tk&S!pIqF+f7UGs=R0*tAh`)Ta1w|+ZQ9%*>=P&V>B0kRSY(gH*4?#509hf;Y z=P@(;&3AWlHUNMvX}uPp1OOzeT&j80+@Nqfuggl7ugM{a6c3O}Oga+@(@re&4HN+a z0RjO60RjO60RpQ70lKq!kyg0(g*9jc1OfzZN(A`(AwreQs4r)P^j;m*cqsr$o&tD< z`jiKFF%e%zeK{kf7fN%A>;e5y^ivEJ;bf0+cal+G&Il>O0Yx~VzcTt63VN$kT*Pw+ zj0zdF0RjO6%Msu|pIk_S4JOrv`TMVl3Da=gnwqaMD?2B5&00y8^YZ2Vg8UQRWAj zFD^$!$qRKHQaa;mQHGwQYr-{b%jsn)hh$tWa0r@?q-`BdF>dcm+Gcv(a^h-XQZtij zlR#-U&2Hln=JdO4%H_R5$4Hu)lZJHK&JkPZGwPltR2Hg`q~l!Qnqt%n zwNe?{Caanhb7Q z#|!u}zJjmfJNQ0+gdgK4_$hvYU*fFTU)CI9kNErb1%5}J#f0@g!DS8Kh_K=IdzFL# z4`IK_=PWHOx~+KK#`4PQx;;(J^9Q-)>=x3tCicpn^NyWLSj{D(3Tu6XqNq8|6rRR2#KOn% z349ixBPPB;OuUG%E#Y0q65d^2%)3l?$}(+hl(ch9T^taMRv7}>Vm~E3|8HOU`~NE2 zb+DZPfdGMj69LR=>uzhI8CQC5^ISVZb%ZJ}+;2umFN7K|9Vh9f<0R+*VMzT5x$>B( bFK2`#4VC}=Lje749NhoG{qK?QCT{))k%0Ba diff --git a/designer_base/src/com/fr/design/images/gui/color/.DS_Store b/designer_base/src/com/fr/design/images/gui/color/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0-C`naV;SJ&!_yxqr z@G*PogOiR+7pPKateNZBbIzSPbI0y=0hrG5@IKH2u)!)exx!{mk^53tO3hul zMQex$-eQ4w=wXhdmEQ3}R3Iu46^IH%1)>5MK>@zArEHw?-nVyS8x@EOTuKGx`H-@T zZ97|7tB(#gngY-^cv%b2nFlB)b++wnVXZ>RX|o68pvI*b#=?0&mF~1{XA5gB9LB<7 zoM+=Q6r703P|q0i9TjH#OSa5{T`;6V6->R2mNv0XFu6mUs><| z)WS2Mi5=w3`TJ};tncxN?EuI82C$aFY?l}k$1o*kfs7;BBR;3^_4rREd=p)ceMaPf z_?%}SDj0s07_MQLsF`AezH7Y_a*MM)#F)OjtP6hmkYDq#|JwHw%he@I&^tczv3AGP zK3U@S>32^5L45sT$?qodW6pZYqe8R#w-PqNW6pMlArJ9=6!zV?UBcfWUg9R>7;=tc z$g_%-Z+tFsY|-ZgZ*<+{tJ8ubk+=z}fCpsx;;DF3S#0D@$TH@LX0$T4Fq7;BpQ(wb z#GIUcM!FY#hHV_Esu^do_~*Emo#C@3c+NeQX=I#186*3`$G7m3N@P6zHQLdbne*x} ztdH)NYQATTKACSdpX?i-FIkRnpXeSVA-G-||31FC#6Mx=O!S!*W{_RrGyECB0acM_ zUJ$Rlz{g+5D_!r2`X5!GCH{Rhf5s9OIJW|Ii)=~$zkB-k|8w(4U{oL~aPbu|jqZzX zhvRg)^~#7P*G^eqvr3VEg|!M{qv<%UrsK5Be;D#SWmmzpoh_{86_)@0A;8aFe*b+F N-~YN6vAH}7`~om-wRr#l diff --git a/designer_base/src/com/fr/design/images/m_insert/.DS_Store b/designer_base/src/com/fr/design/images/m_insert/.DS_Store deleted file mode 100644 index 9e5b4ec081f94259acef48314f98934719c1d6a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHM&ubGw6n>NBuwj!>@E}Emy$D4?6ugNTVm$~RO6|=d4;U0B>V6wut3%j&dpy<<952k>cqQo#3j^8tOhiw;jX|08m zv2Zd)WK&cqMxq0ki94CLwR%+sl!40(aP6K_mkx2{Uj06JHp~wXhWPT z?)aIH+M{FC{zK{)^?!)}9N<$rKo1j%+bctv>j5eO>KM3bJc>CB{2SswrXD>(j3ExY zI}v1OegwFdgUf-M(+GPSQEa6fVC%pRk>i-&05L$mM?RO8uK|L&$Z;@xjElypJ_=9? zxLff~)h~g6df~r=SSRr)waoxk2kNzq)cMX%z+LSl5ND1unlh#%M948ttco&Cu%Pz|0Y)gd5S7i)sP0 z05d$wt|ntDVO_b{I-(8ncARBYA(h+sB5yi;HXOtX9xLAwY3kro;BqiIl6ULIqlv!U z{94dDvp>iCUBSMn%*8gLv3J1r(Zh3S#?BqyM-0?feTk3zHz(IRyhq?BIYq8O2)jBDQD;G2bH6499O> zM^wX#^RNvtdMpun9xh6?1GRa$I_56VdmfXh+Jx7I^L95K#6Dt9aqtRYSE)Yk_7R=4 zVf7En=O(X@UM?+Q&vV%aj`dNJ6|a&jusK-lqKD`kv7$ZfH81W2F%O0RmD#hly4*Dzh z)-UzUd+iy{S2($`-_lxv;3C`cu(BPGKX^NS3n%;DW6KTq?ZPgt#S^rD{?7oeAGQAX S_IG&~)2mvw{wMm6>;GR782=9d diff --git a/designer_chart/src/com/fr/design/images/form/.DS_Store b/designer_chart/src/com/fr/design/images/form/.DS_Store deleted file mode 100644 index 83d87b9ad453939c71a644c41d18346140232455..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z%_oBMr~^{a7DO&{ z_{?Le-)Wxt@qjlOej@|;?nYV01Y9wD^ZtYnGtd5695u70r6*n(Dh`i~8m2i`GE3v7 zL$@J1ZsujJX4OmgakTAa4c|-a)~p)^A@ug5AZygZWFrpSVX~EOdReGkYeK}}Aj4{& zzZ->}x;42blFW;eFqOGgj)T1@2}GwVT1n89{yMo~%sJt)q|`Lbx;4}7E|ym+s|)tZ za;3LmclDsW-0PXf^n7LK==A*J^6L8L_U`^c#xV|Gt&|CkeRzb<2Ugl{n#3YGfth|( z-wpG-A922jhyr~)OCZ`B z9gVp{m;vD`6i|h7eZ=4@9PGCCb2R1(RXF2vWyqsf=K6%f%hZdt+hdqK~c~zSNIwN9a)OO7fbOJ bs1&f<*a37j<_f_ALO%kM25N|bA7$VL2@GQ& diff --git a/designer_form/src/com/fr/design/form/.DS_Store b/designer_form/src/com/fr/design/form/.DS_Store deleted file mode 100644 index b39c40f4bde105eef0cba316a14a2cf79b544a6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}*0S6rX_#U8r^oR6#jx>_HPS;Va$@Yk??1(@GmC@=>diMF6>Bx|WQ^=fW`1wqy!U43H`#eR2qB!Tmc|j%5kg^T z978?O{X+OSZ*9_{ES-Q@s+Y9fRsNK={Oy9}=Jnx>T_T_@+a-TH zOX!?KYJ{fT8P*A0nw)&p_3y0o^hQpeit4ex{@6e)9*>_s6CWHpJCxV^ z3s!Nb?DE&2VGeVXPL-^dUAvU2SVfzbb3VE2XY75F*ZY2QT_mNABU5&-0zLyr29fTX zO9&PDQd?Ud@pC`uD|tQY6A#aJe9$;Hc zZpCt4i(6 z1FM;_x}jh(JLETnJHn>Kpbr=b7-(gH|NDdJy#CMq{{AnVf-YbnVBr5`0EcEXvq@N+ zs;zCS8^*Hs~j7 zqqRX5PzC;)0{rdn(E|L@UW%%yB?AjQN zj{^I!#O~1;+&9FT(HY_-5^d^_Wmbq)oXJ5YR*G0Ndd6xJe}vk#CqhO`%sv5^RoJo~ zbBYL`h4r++DM#??5S&ypx3SWc=FpI5n{3M)9D%qR=8Zz87G}wBX^D&@%z5GGg_BCQ7DlGqXBoa%cz9IXi2^vY+3LIpsHp;~ zfGSW_fcJ+8&KNt)Ey~t`LaqS75Y1w!^PdLhL=IzzxkdEAjHLoC)wnB$v2?UYZd~jz zw`l2PBs1c;%*NeNjATc9B*V$X7PV9bRDrSrfqiWA`G2$d{$D2PlPaJJ{3``a*uCp^ zuq1c3t}Tww+6aCRXXA0XMWLW@$FWrSC_aXZp)cYJFm{+*L<>y+2#5??r~*4x;1@Y> BxD5aR From 97bef2cb76c92244fca8d64ece83c8463c0d3046 Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 26 Sep 2017 09:20:30 +0800 Subject: [PATCH 6/6] format --- .../fr/design/gui/core/FormWidgetOption.java | 108 +++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) 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 18fe7a83e1..1569700601 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,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 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 +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