From c3c53a72c2aa0ac4c58d0f1f5848afbb5d8e1598 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 6 Nov 2017 15:29:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-5284=20=E5=85=AC=E6=B5=8B=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=85=8D?= =?UTF-8?q?=E8=89=B2=E5=92=8C=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=3D>=E4=BF=AE=E6=94=B9tab=E8=B7=B3=E8=BD=AC=E5=85=AD?= =?UTF-8?q?=E9=A1=B9=E5=8A=9F=E8=83=BD=E7=9A=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../propertiestab/authorityedit_disabled.png | Bin 667 -> 627 bytes .../propertiestab/authorityedit_normal.png | Bin 624 -> 639 bytes .../propertiestab/authorityedit_selected.png | Bin 639 -> 464 bytes .../propertiestab/cellattr_disabled.png | Bin 380 -> 640 bytes .../propertiestab/cellattr_normal.png | Bin 363 -> 640 bytes .../propertiestab/cellattr_selected.png | Bin 373 -> 386 bytes .../propertiestab/cellelement_disabled.png | Bin 156 -> 241 bytes .../propertiestab/cellelement_normal.png | Bin 156 -> 251 bytes .../propertiestab/cellelement_selected.png | Bin 156 -> 194 bytes .../propertiestab/conditionattr_disabled.png | Bin 344 -> 266 bytes .../propertiestab/conditionattr_normal.png | Bin 352 -> 273 bytes .../propertiestab/conditionattr_selected.png | Bin 361 -> 224 bytes .../propertiestab/configuredroles_disabled.png | Bin 574 -> 734 bytes .../propertiestab/configuredroles_normal.png | Bin 542 -> 755 bytes .../propertiestab/configuredroles_selected.png | Bin 559 -> 513 bytes .../propertiestab/floatelement_disabled.png | Bin 135 -> 242 bytes .../propertiestab/floatelement_normal.png | Bin 143 -> 233 bytes .../propertiestab/floatelement_selected.png | Bin 143 -> 261 bytes .../propertiestab/hyperlink_disabled.png | Bin 708 -> 653 bytes .../propertiestab/hyperlink_normal.png | Bin 740 -> 647 bytes .../propertiestab/hyperlink_selected.png | Bin 729 -> 764 bytes .../propertiestab/widgetlib_disabled.png | Bin 619 -> 265 bytes .../propertiestab/widgetlib_normal.png | Bin 614 -> 264 bytes .../propertiestab/widgetlib_selected.png | Bin 628 -> 195 bytes .../propertiestab/widgetsettings_disabled.png | Bin 0 -> 290 bytes .../propertiestab/widgetsettings_normal.png | Bin 393 -> 302 bytes .../propertiestab/widgetsettings_selected.png | Bin 408 -> 221 bytes 27 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png index 3e103533306e854a8e69156ba3bddef4488998b8..49bd32545bb432e1caf7c0bef3d546507c87cd50 100644 GIT binary patch delta 589 zcmV-T0H6S!Qdt!)|;Ow&XONL!7ThO~IUcAY8AxtODFa+%%t-oDwH+vV(@QLR=V`M&=O zC8lY9wr%^@GC3!rT&@TNs@80Et%6sllIn%LfDC(T4|OFGhIX5YM-JbTBW++oFH zaVZSLEu?6gcG7G%f6b!<6>_=a4(Eyw0D`f=h$1kA5PBj3r+>%^0%6J8SXG73dBT@9 zU`#O%51a3?uHg?F=i$1dux|hn2Vi}GWXEyd{KUanmyK>N_hK1fV90rkLa2;$E_;;g zgOGf5WFKQBlS3#~rUTCf!?^pF0R|g-8_thf!_rJCfJj z8IQ$txl5A^z#K7Zycy$)f=Z>L6QNu#e_|~9Ga7|2(J@Di>Qin&XO$Au+*tPgKJRwB zzY(j~>!R1|{a9UH+r+cuwB90yIoiU)(weG9Omcd7o_{IQG~vo^esb4)zy>s_M&*2z zmJ9jy3W*J}ZTl>W_$Zq#J*FZ?0QEb19CKY)?w5MuIL>T2XNr)>*n-FjQ77>)}VjFwWi)9z5?$V4CT^5K-1NpPhT&=?HPMd_KP-hioU4`a!K$ z8xoH3+HN2OJkK4NrZrHMVJ4N@xaf2`lZL61ZO)T+tF=G55ag5HS~@C}N~Qakm*I~5 zJU&NJw1|%*mAq>-8a{F2@s=Vgw%hH$o15vg;V^hAKMk;~RO{yB5EtV=qMiwn9}X4q9DY z{27w>(m*lxbqHu3rMTFacCqojKoLP)3JxmbAULQXE*H-x+4+;-t9PEeA`QoN)&?fLw}a9BNADHo?4@C^+vP}X}OfN8dh%w1u_0x!g4 zPYBRyBowdl)HB&zgM;=<6h(gobH+U9^I;ecY;T*RE!$jR<0<9SiUeR{vsSyep=7tX zx4=f;FK@bhhkubvNFD^UXD!(F*1#0wxcXwhM!$_F-J+Oql_T;~!)`jk`Wo@g?C3-{ zSImuljZ6kgDt2?l+?X2ijcp;|uuCSjrC0jx=7Mp19A^Db z+#KRAngoP5s!5HwTkjK44!0W8FX`Y_pY!U^Qh<}cjep;FxmN}Zn5yFG6A^%)$x9Ar zki79ES$wY|Hx`Ps7s%Q*Uf^*(S-PxTT9E+RjG5-E{zbUE=KGZq6>0SS@(F&3kN7-4 zL(W`RTw;gO%1ZSsmwSnOe3+o|x>O2}s5n0zo+Jc0{3d42xq1|(2Q8Y8t?8s7C|~3! z|Ac$z2U2>ODX@05T?y?V!9?waw;^ nS=wFYy1&CAQ{2BDtw!QMQo78l4+pyB00000NkvXXu0mjf%iARO delta 586 zcmV-Q0=51B1n>lqF@GvaL_t(I5sgzlZxcZf-Cci32&D<7U04c=MB^ssv&|m}68UN@ zQ2?b|q@+lM5Fi9SC;m3V-$%V?3{vnuo+2&5@5d z=RX-!9i{lG5RAj-gTQ}Cabbj%k`Iu$z&XnTJ3$3ItE(%E$H)FIZSo1D7;%V8IVL}{ zOG}Q54*%)cImx)3N~MzS^?EPxM!IytYq?zRX}w+_U6m7E?Q)Prlw$d0GU3uDpRmh3 zbB-0FN)icCZGW{|ecI%k>P)h2V}(FU*~F=T6?PtqeIvC0Lm0|;#bU8aO!5hv3jSrR ziukW`xs18dYi{m3TCGkelkhuj@-?R8uIt{=bEVIb5Qfkjjlw%q9oA?xCP5HvnKSu> znX{B~9kcYsoFgG2#9PMXHrk#r!8nV`uc3>NF`%yvCw~(1eg6Ox`=i_KZkixjV4q+< z+SqtJeuYR2fA6!wqrXN#sZ`40Jv=1evq^?b79aUO#^8B6opL?T!{5_u<{JHe|93W< zJwe&~nM~$zI2@iCB3Z|A)=J6|;yP9PO(<@! YKacY5%RMZ0(EtDd07*qoM6N<$f+12C#)hgOld$4%z!CX8DiXhku^0uw?+NguoI?S9128@S#y=p)TAUV>LAJkr1mxGs!mv#6W}vBC}ESk0Q|k zuhh>_iq|~9KHC#|hz`W4nf%8iIwu)7@6=>9B4}+Lq1?C6-gt5v-EMPCH&8G! z;gC-C+Ck}(w|_CAJ6f!f?4&1U^Q+VNMY`m=yABryVvYD5oX!c|u$C(J8}Z4N>NR)% z#6!x9RB|*}>NIa5ksaZW(M7JCb{jhATqUlT+AsIBbjbx%exyWwh`6KU&U2w;g zC}hxI&)Lg5mRv9$2c9>{1-YT)KSn0;fD7^pAA3T{xPQo+UM|dQ31jZ5CNx^hCZ96+ z?fXyvl9Cb;;W^j;vnaN`>)m1E{j03=R`EUMJyxUx^@h8dH0DfHq+*F93-xLK1qu$@ z!I!x%-$+C+X7CdlbG8xCqvJ*Quwc=aS@I|NAG~Y8o{XA^CVVxWz*j{D&|L5vwA#Ez z+Jx)`DN~r|q8xuci&fQY-1BM*N<6mgjRp-W^HMi?*w6RU6ejG%S{6S%@k^lez diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png index 7ea07bb9a19647d6e77481bf2b0b37475d5ef919..d708498415d6eabc5d9194258b32430940f6e778 100644 GIT binary patch delta 603 zcmV-h0;K)?0)PdOFnOxnGFj^NfOUyY%)NYR(}=jm9?2q=nYpzWFZCb zaHjr(kPINE4FpX=>Pfi>H3*_1A$sQQZfD~`RDciSwYUFY4=U2qQHh20`K%Z@0^4M> zoAoCTzh*N2)~}XX>~>{Zk>y0&K}*KSZMFNM)6eEKlIP|geetMgwp1$R92m&<^n=}= zS`cXtRUIdeqks9Ne4$Xd)4MM__mtQ?Gqse=V;cO?C!P`JJ{EdYtHmp6MeY{tXhVn> zEr|KPEMler(wjYflEusGV9xA|yj1X`06|ViAhc0W9^bT;keoxHN^WoO)2Of+Zkt%; zZm~FR-(N?vLGXO#!RAC*%DW`JJ)=aFl?~+xOz0}q(|t@>Zja-5 zM_XBQcDJ30m*DFP1Sdv}{g2pKeLHE6f~ zLs{Fnp;SNVh<;-hg!!5qzYnyb!OPp~{H*FbeEM47YT)xmV`=MsWBK)^i&tJ4p zqHS2$qwXP@tjGR8qQ7bOcpP4{)_b$kdn;wv8HVAdQY!F$|9@pZFVFFdOxnGFj^NfOUyY%)NYR(}=jm9?2q=nYpzWFZCb zaHjr(kPINE4FpX=>Pfi>H3*_1A$sQQZfD~`RDciSwYUFY4=U2qQHh20`K%Z@0^4M> zoAoCTzh*N2)~}XX>~>{Zk>y0&K}*KSZMFNM)6eEKlIP|geetMgwp1$R92m&<^n=}= zS`cXtRUIdeqks9Ne4$Xd)4MM__mtQ?Gqse=V;cO?C!P`JJ{EdYtHmp6MeY{tXhVn> zEr|KPEMler(wjYflEusGV9xA|yj1X`06|ViAhc0W9^bT;keoxHN^WoO)2Of+Zkt%; zZm~FR-(N?vLGXO#!RAC*%DW`JJ)=aFl?~+xOz0}q(|t@>Zja-5 zM_XBQcDJ30m*DFP1Sdv}{g2pKeLHE6f~ zLs{Fnp;SNVh<;-hg!!5qzYnyb!OPp~{H*FbeEM47YT)xmV`=MsWBK)^i&tJ4p-kX!|oRqr1*5QnZ$FAF(?f2;fesLT>rGM#Rt`xl)^S%IflL#ct zJe9x@0T9tY1RIduo`UG+)Q|}g?IixwaUO;^(1F1QVn}1N<;69#D#`&tk|ZEhK@be{ zoWBYJ@iE3cm!*|!4y#Dr23za(x3M(5Hny28Qul diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png index 87c812f7946c7d320d6bedf71bd89bee649061a2..562300d4a93d7aea1c0bd7b0533fef4ae7a0aded 100644 GIT binary patch delta 346 zcmV-g0j2)+0)hjOF@HQsL_t(I5zSOFPQySDy!F}2hiH*VLKVX!5b+bzfS`$>;R!b4 z5kR^mNNM>{WS^Ivjn1(g*>R*4Tw(3a&dlBJo@~sS7QttfZNHh#r0%&+1~g2!T*nYM zaU!!=O$Tv+WYYv#-{rMx)K}ES`+r7Vw>>GRQ)`=!cN%}>mw)WanKbqSm`v)IZ1A?c zi#DEfv`3>ff8>IH#N^f(JGEpJ#K6Yy`9m)wy$SK04eNoHj8*_KFfMrx4)!5FZ42dy zq7plHUv;h?;CLq3rn5BPlfBr+QrgXaua8;#rZ>W~uP58$brLR+li?gt)TnK0n9i=r z2f7LX2b<2)FjHdbZ&|4t0dn9RHQK!sdiG|+w3u9HMGT>u1oY(JlHLfvg2rLhc9ldg s6w;M&K8X4!e;zP;_qTL1zyJUM07*qoM6N<$g5cw*9smFU delta 333 zcmV-T0kZyr1N8!sF@G;fL_t(I5zSJ;PQpMCok85<2f(TPge2Y}!34a)l_Ms65(;wS z>K}0752XJwBls7Y{c0 zfHuwumn6aO2uAKoiR5qeI`lz_ZfNTQ%go3IF~3T$p5^sxdzbCfQ8i%r{s^;YQa_Tg ftbsft%yZcTekXnoO*1(y00000NkvXXu0mjfT_T)B diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png index 2e450c35bc36daa1dfdc68e04a05919d8a6ecb45..b82ef7fd01169efc93bb4b300c83a923f18ba31e 100644 GIT binary patch delta 200 zcmV;(05|`f0r3HlF@LK`L_t(I5o2JW5?}59` zAh_3vbpa@xKwgBYM+t10ATcz-z$V5JkeZ6*yL_t(I5o2JW5?}9(|^WGAUzO+KrEmk^X5!S2QhJhq?EigTBt`&c!gNG7u{U*FYr(01_NU*0aIRRsaA1 M07*qoM6N<$f(5@)9{>OV delta 114 zcmV-&0FD3q0h|GlF>6*yL_t(I5o2JW5?}0F@JnXL_t(I5o2JW5?}6*yL_t(I5o2JW5?}0*V5VFn<8VNkl%>P;E5RFBcr6PP4=7S9KEec3 zq?%ZjRnw$$=60!bIiJrtfZcw$-mLFWmxTE>Zk%INAb3RgnI?J{?lQQ;xB}G2FOmNVX?t>E#V?TypZ}%R%=jg8 cEwtnM2b8u`Q&0k~n*aa+07*qoM6N<$f?M`x;Q#;t delta 305 zcmV-10nYx40@wnOFn<9ONklC2_#N1u+a^H83qjG^CwT9d;;U+HHcV4@VbZ;LvR{Isv#hQFrwes*o7YyJ0MA9 zfF35uav(N_K@1GvM9>uxG6btZ|Ni|EL^g;RLqO_TkTrqWzy!w$OlZ%Um{{I3FmSy& zd2-K3bTu^PgDTUJk&&q{CAOS9cX~6Hz^24VD(D3Ohg5Yo=TrKt00000NkvXXu0mjf Dc)pBS diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png index 14ff765e43e622ca8e13d6d9b3db141625ea1942..f80c5683ff6f5627ee0327c79fa51d34424d74c8 100644 GIT binary patch delta 233 zcmVK;x4`wMpMCmY0fy4~3 zg0YjPO6`ai_1An7JHE3o7l6es)XEOk`AtA;o&Oah;K%8LK!WfDf``5<#t1ti@~)o% z@zvhyZ761vwz(XOK$YBArz@wtlL;6!l*nDW0tG9CT+7pgkzyu#WmM@>fY}t22nM(_ zALp;te2U0mr1g(K(m~|hn|hPV4ACU}JIfP^>`s`&JN;pQvOFgm+RitTbmT)u%YFWB jjI>GiC(HAZmV5pJjww>u2Jxhi00000NkvXXu0mjfXG?C{ delta 313 zcmV-90mlB30^kCWFn<9WNkl;JCj)CFtY>*iw8Dwf|8vXh6mn+Q7%moY#jQgOD_y(d`pd5k} z$dLd485RN+GXMGWcN+@}v)A9he<%F^&jfZ6QDFo#1n3=RB!3(4^78WN95`^`2S|*d z*RUDF$jJB?sI?Ae2*@D3F2ZHV|No3}XV0Em1~LE!aJmSWA&iU+@#uzt48!Uoe1@Dp zeR?U(705J(K|n(cfU$E1IbcCy0&)p1LqG;%cn#=(M^X*JVbFg|n3IWd2}~`v1Sty) zy465Kjsx@4elnnUF2EGig$4(?VF00000 LNkvXXu0mjfcS?v^ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png index 082dce2e824f35498055bd77aad534bfdd56ebf5..3287573a9703672fd51703827f6e459bd3292182 100644 GIT binary patch delta 184 zcmV;p07w7n0^k9VFn<7=Nkl0KLohDa^T!=A4q5Ic&sUmcrH?Np0$bvS<}x zoU%rKxoM3Try2HSCFF2wq8vEaL)qlz%eu_TPV9<`>uMtF`7tHVlQQk89ru~l-$cBR m_eOv@%9{23Rvdry;dlaW5;da*b~Mod0000Qwvy delta 322 zcmV-I0log<0qFveFn<9fNklCUDP}{~iEXP_d4)IS6;P?-YV% zIF3K=HE*4&(BVjy0Qw?W6`+kI>6=jr+8Ty?uaoGRPV<=H*na@U-fV5yrA!$j!V7`8 zNTM6MtsNvEXG%>Im738HB8q&MHomkQt+n$m-|g0)N6SUXScsDpF=%e0LIkoO9C=p; zq*a)x2qER*H)2?BqIt-D&$~=h%&r+|dlaq5F&<@husRbms=8dQa)*e_5x)?({?bW$IVpd(6zJKDVIGPpjmI U&I8;pO#lD@07*qoM6N<$g8WgJ^#A|> diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png index 136dc6568592def91ef3b5f54a703162dc8274da..3c41b0ad8dcd447bc6b36cc21b638dddb1712b83 100644 GIT binary patch delta 698 zcmV;r0!9741l|RZFnC?<|WB!5IHa*96%K=PjF&*byd ztxl(-qJAt2*!E*nDLPLG{h3ZDpB)_38qMZ@)il|@Qpz$6<9gIb-$#fzf1N=Go=lp@ zdwY9g=v1rKPB=HZLXZnXEWD2p0YFL{AekRF{ELB4DM?0geIFsREGr;DqJZ$c6Qrb6 zv0{%9an65GN`IA<>|&T?ZEbBFK&2B2b{fWq=Mf^U3-WxytW7N~Elp`dd@l8UaaW&F z?3Ui6i$(!`Us+j6_WR-?W)3o$)YD#1T$Zwbi!u1?u;u_RpA zoe*L$g*D}GZEYbIzha5BDS%82T{ve(%GBy?T`pF^|>lnkH>!v)RwlR{2L{+nW;r-8&e|Bx-?$m}nIWGl%7Jd7wXlx?MRt zgM!W+en0@QL&tgf0W%y#84%g_dX7@Bq{YSdILc(kK833~{0wcYRPQDh<^-j@?Kst@ zCJTrb7k`&G36WUM)2|whT{r9)ch(UWi>tQ*#4M$j(`dZt1Y%=5Wd~J%jQ=#2_8j|5NdrE-|43d#Fl`ArifG!`qNGr@tuf7&z3lF|lXhk067Zq-^38nT%*X7^InD!pWRp)A zzN;$5YpzR+QmPwD*;y2Q{JN>$T_-dejh9l&r`fDG$>*~tgnz(H2=Ss?eO8=Kr$5&9 zq$X;$T3eipHvoJ6DEhE8O=0-nC*)IyG4E(N9L^1Ikea|?979D)_->n^hB@-6n_3%F zM!qjnoZYZVPc`|z|C3U(jZd)+Fh?GBn>TT4M=0#?H(x6y%8a=a#@KJp`6JHdD@wiV z@%Z42X|{2#5q|&>Gy@PdQ%s0=h9*Rx&~P@UjP&WZr6jvbDdu_3r4TgHPs%DK%i1Jy zT{s<$Mwhk;#-2@tVe|QNDRu$8&&S6{=eCAZw%hF|8kNnP`0qsZdVL4Ltp-8)u-EHx zQ($AK($8MwNdH7k|J2T78Ue!qW%HLE|n+wHRX{C_rd95EgY1`E5{j)NfBTP(QV z9r$s~YeFQsbNyk>>iicM*E_yXzC}?qvm5PLPgBx)UYpz!q7D%;zvu6aTvwJk&;7F# z+vI=Z)kOMATcwh-dh4bpy^CL3i}mGl0Q4;)=J)*F)%3F_nh={z3|}Y|PW7@+>}4D6 b!SD}Pe-h%QmG+rL+$eOXA_$`06zry;f~dF>Yn3c&(qKRN-0|GD zucS$eZ;`oo=A4tc=gwtX<@0t0PLQa}LexyeQ-HmxG#yt42Y>G+%2Bvn(%aQ@PL$kd zrU{6QlF%k%Izl9qCOdap)}2%_&nQj=0)ZM)bQ>aLCf7E`9!5H1(a2F^ZWkeUUS_Wq zbM(GMC_O8?@y}}wGQ*Y?oUutUtN$gs`hcSzv~z{AM2HkOXn->1XCY9pSs1y+dU35p zhzEh zQ;^#I{+{C+h&3xwLs;h7VZ?26VJv(7KHnv`qPh1>oU5vIZO>$qK1C`_2KUFUNN=Hl zy)NlU7oyS7gke&jkZjImQXa%(dZxB*b@kcA;#gKlgMUPEoedTyCkg+>UfH?gXci{4 z7Zbmdr}lXE51#hbJD5++9sXi$$aTZ|mK) z`_Rb)ba&>*WU^i77llOX&}zao#i^73`w|JN#(Vj$aTu@-I#%c(!!T|trEX;N*-u`7 zPYOPL#cQ9$bkE?%W&v^F9;;!fCheHd{%L>(hDg2)hr{_oYb=}H-F>k+r*bFJ?k=Po zA+`mv8Ukw;y<;ty2ICt@Uts)*VKhCntnRE9`Ug6?4}dj3->v`v002ovPDHLkV1j8~ BSt$Sj delta 504 zcmVY5S_hEE{K9QS}90C1QSHO#6SuOXlp5g zg{5F+AsDexv=Fqi)zV7I53rLUq9o?jAO`I1v{BE(n9VwKAITZ_0)hj}zMYS^Gw=2Q z{>fMnPb!t_7eeew2^q>^4Dy`w)k2~0q^i+WPKTs^Eu~fl=zlP15w6ulkz%Tvkjm+F zqV1bzan~2$HH-j`qwI%~Zj=WJ@V@e{%nBJP`or7XZBE0ns;B&z% zZtkB8PORzikWwRE53N_LU+1I=jpHN}aeZ0W!;@aIe-Hfpi9{mq-rnmLJOhNMO!MmA zPvGHSM43#c$A7XuHj!i&lWuW6;tJzC8p3@X{m0Sh;7Tr+6L@aekI|CJ2$iUTCL5*VljzC{tz@e!cMy0->nD6w4G9^c<>|3Js8GfnDe_4A>=NmvEe6N(eIQ z#37Lz02)Hra=RmEZ0NS>qU_uhZ5XP3l=}Wg9?(l#+3-oludh uQRo6Ot+qzOk|s^DHCt?eV%xeu1-}6`M!d>}hu9kc0000D{3trP2;Vp1x;cq@5~d?mcgrpntvlbO6&NzRWIUpMG2UX3mYan4K65;Jq z7VrFi12md<`X#|O|5tqZ-h4A~vdSyQWs z@_j~iS^O_Vak(dZTBwhy+5=Hwu*&%BB~do1tOw%XVpE+b>7Dhj0F~pToyTKV$*Vsb z(>5hRy5mH$mm}ST(8dFdvmfJ~a{2z54^!iZUU7XXggEK!3+?X=;HzT10nzx2=?~BD Q0ssI207*qoM6N<$f@de%A^-pY delta 521 zcmV+k0`~oZ1g`{;F@NbvL_t(I5v@~ANK{c2KIb~`O+R9Ra3SNX38)q0JOX z1c3y#X%VQnNN^G8%55S=;v#j~!i^0P5%fbbL_)M}S1uC5nRmzeJmnz0+K*rW6CU6K1ne8&Bqf{M@A_OPUjGEWlkD?MUq;<DLBXDNcP01Nukl_e z^p~~DW1JC@4PtB^Kb8(WALE}Pxw4F&J!?nLRSD~1LgIsts%z-n{*`@^tvq}&o<7R) z-1YVcB;V@xtO2eo&}Lrk?N7EAFR(r6XnQA{64|#!B7a(_BHX5rU>3L1MVlrCQ@eGy z{wr%ZA@Cisb5{vPkL!dh`19hnkd8-u4|Q7qQM!qA{Nn%7rj#bVrl#`XcTg}qO5hf*m30000< LMNUMnLIPld6XpIa diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png index 5525977557eb3eb0d8add7487941021de1224e6e..0f2bd67bdfc834c720baf748e229eea63ac81fb0 100644 GIT binary patch delta 201 zcmV;)05<=J0rCNmF@LN{L_t(I5$%*w3c@f9hLgp|fhU;g31oxz(HnSaAKODr+zA9< zYwSPiUAXYgGsnLYX00000NkvXXu0mjf D`JYe?FwD`@#WBP}Fgam?nSqhfSJkUNDYiWdXHPIKkzxy~e|P8Q*@D_95^ZbR xIrD^Cdjgv|*dJs_@E$dgs+l>hKtpIH6T>x2-rCBnc^(Wv;OXk;vd$@?2>_8EB98z7 diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png index a84c636d34c56314b25142427fa1254dcafc6479..ec3bffbbc34ff9cb71e8b5b11dc0c822af358f99 100644 GIT binary patch delta 192 zcmV;x06+ha0qFsdF@K{;L_t(I5o2JWHb_Y+$WBVlKTE8+AhjSpF!hWe21wu^Li@f2JvO=1iE%0#f{s@qZH35D+&FL=Xjl7K8ONFieH3PfE#~ z3B>>50t6T!wIDq(WlS&zrSzylghOyNj0lGjIIn>->;L~oggKRCQNhS~Zr<#P#^Aih u^q+AaFwbz2muVU2p%_nTF@j! diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png index 477e9d448d2e221b1b2c5307931bc38f7f841a42..3547eb694a3d71733e40c34c6b71aa858697d37a 100644 GIT binary patch delta 220 zcmV<203-j80fhpPF@L{FL_t(I5o2JWHgKN%E8A)Iud~FO3sMWx15?ikVt@qx{rjH- zWNI)lFwTNW;-~+o0p)KnF)>cro6I(q1*G`@KZYbA1vCT%zzQHt!lVXN?^L)_$JxJT zI?n$2A1*+E0a6Rn15*Ze5sU+)2^qLQl^q-;F!dms37JC)dsWmR!l5_#!U$_R!j?`5 zc@CVgKpF5q!+#?}im}NvGBBRom&#@gb`c{J!#rS~;Q}foIn#plqF6v_F@jiOv`%lIq zj_bM^-2h)rGM~XrvAo-p`ki-z@=Q;CnxR^t*>-F@k7esF~KU7qwqqdmg4 zB|sjJ$D&xYC!8m|gIfnB#%(9Z#zOMu>gRWF6-Ht{h4*xJTOkn7jLVuy~!S@ea>$Nb=bSnyTHoJFv zy~d4Uupz2Bolakbj`Z79D%#i{krSoT_m*XR2ZY)r)9p6vNOrmGo&|x(G4}G@^WO7K z`L_X>qdJt>L#6!GY!)PYy;c)@QN^TG$WM;*G5U-D5gGuI!NIaJZR#(fY2q1rD}vBG zr)lzlv|zm7zxV~8*w7$AsnOZUNg`p)RxgnU^g5lfRNwPHeuHjPH7s@+N{s6G{vsCy z@(~4{C7mG1rwFpkFLv+r^xfX^@!KqN6)XIg!{7JkHJW~12TT9}002ovPDHLkV1j!L BGvfdN delta 671 zcmV;Q0$}}(1;hoAF@JtZL_t(I5v@{POB+!Ty&s!wS8Y++NC{GrR%oeEH8C*?#g|fi z@Lv@C8Tx;G3?hA#mb4HP7om9(8WCDs5=Da6ZL)iJI%n-JNwrVyh0C2gbI#1%GgpZJ zwB&7hmY0|BcDvn4BAt;^IKU7IPfF9aZTq-Vsa*WY)BTRk&3{dGanYUeeScO6Jwz0y zgs={UP-jGDoP8s{A3VusC++q1H>bP1yA<=8@LI)0*l^DO0Oen%J=6 zLkt*T!HM~aQ7*rIZj9s(r5^-$4uU|BaR=X|l!Of%KE!|l7My`Z(1csha>cJ)x$C;` z+k78QrRY2c!hePjF<>l9d;tesU?Q>e`K1{mlB`Ku>kwV~L@EnF7*f==QZmF{%J77b zlrbulQuU4f4=m0mm0FcRy9$+%f zW;61k%HI}uCxHbgdHQc~r`0;2Wv8($EBb)kUC?MWqNf9MZBqc7|Cs|UI6R=}b4Ft4 za;2wA(FC`fHbysG_ro#7zaBfNHy7gh{HuFm=ncDW~cqwjdW_w|J&LonbS zZgTED=X1a3e4kSPX;H{=oZ>Q5_XRVr6A_c*kDBy@YSldobAQJD8c+b~d}mfRk!mu_ zuGk_)#~jf&>u+9t83)0g#ug}1wo1h%-rhU-m^w{H~Kq;1I$F)qIf)h3eG*2KNswU=-p=f zq@$QOe4qOdjDJE92Ot?NE4BII;PbYe?EoTeZ8TfGW!sv*RW6q+VX?d@?~DuabvT2s!Nk9wo9 zX8ZRYX5YiiR777Ngc;WWGKX@BB=&g|3ZMjvpbSuZVSnl^6yq_tnYve4MJ-kzga9zO zGaa2vARdJsw|norTIIRc`iX&^_%-BV^;-+V;oZzc(IJ!oBE>6SwQ>=|PNuiMDpqUr zXSD6QZp*kfTpmPl$4Tch($-S5-8);aRT6`aNy~?Fx7O`aOe$JKtqlV4D%>$MlaDg# z$hUQByIPaYT@wGVNq%F0|K(5AjcpAHgKkRpw?K(Nm}iM}%B#8ce*z)NxFds=R@M>A vY6zqlLV}|S_Iy5XWwV9znAHSjlcoLzYS9QnH&h*S00000NkvXXu0mjf9)uy^ delta 703 zcmV;w0zmzT1>^;gF@K&(L_t(I5v@~AYZFlveQ#o7XpJH^!4OQ_;HHRfGQpC9y9(NF z6k-=bL99PO=tg(_2fA^g(S=|GW?K!|K!b=4NoJ*1SNSLyv>=AqU_R%0&LkOXX;=El zoqOKB=f0eG=Z+BnX~~1mi9{mjloCs@%R;DNpCh-W6mMYhe1AUwX@8w#Zy*+nxkg4t zA1bAuNhv2$bV5pP1$YDaD!5a~Ee8St-^|QRdTVQ|H>|f6@sMJ%oI*hqO1?Q9a?v!^ zi~0Gv36j^=UX?XX-t6_%b8t?B^F9=sxROjJ+sxaFs090QkldOkZUO5cR}+cVR3?*A zet%#BIS=d!a(`6UsMTs0s@3XiV4?BR?}=IfOrZEXdXP3v5s^}DGS5ZK7<1$xvWjai zu-3}+5e`Ql;Gd2Fj)CMtPkt(8-hc;J9kqy3wtx}RUc#RQzlHb@Sf^0P-?bEBGYdNd z!ZjXA>+vD_JcRHP4+wD#qDlZ|$D;&1k_@lRYskaT| z-L|DDo6Ua42s~EG(c~d$;6^AkIX9fzgHGa?P%4#{F%@jdtfh!VCg6I-VyWiw9P?wE zcf(=bz8X1umthnnzBf;^*{TBDy|g*H9!XG$(w&VK&^SZ9z2Y;P8ThWjhjYh{0 l>Jb&}Q}|bphV}pK{{ZH?F#d?Mok;)y002ovPDHLkV1ikaRa^i7 diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png index 80135b0465765178bc637cd6a2027c6534cff812..96845bf6c334b52304bb9fe9a76a252c67155737 100644 GIT binary patch delta 727 zcmV;|0x1321^fk&F@Ls6L_t(I5tUO-NL4`;K4<1$jVz2vq(3!C1EHUttCtw`w+kZL zi0Nxl5P^hbQP3l!{3*~)(88BRCAetSLd=TZqKI%2?n0qwVH+2f>GOH-%;}q}hCX;^ zv$%8aoO8Z8-}%lkEn9WHvWF!sbw^rz--jA$jG1LwNM4hj=YQ0I=&7IKC1$D@k}?t@ zW|b!4o-$AO_cifcUW7%5a{JV;pc5D05V8C4>jTAyyEsM2F;< zh!ipLs8)P}Se*f-Ph{;z0LH(D!Gpvb@$#a;p z#=|SZWNYJI`$#`+&ScCXBenyH6&R1tf=c0T#^A;PI_4{?ABq=zSTP%kIt~GP%K>YZ z-D?cLLVv;!&H6fe)rN{o0aC0yxnPYN1jXIfa5chL0y%)Cg@77V;i2S8RCG>hxyGcY zW4rX=`)^cY!vNwC8RD&OkN7zwca>@X30n0Ghb25c`B*=ulS=HMq=8K5JP=lJhlqLe;J(j*eHLU%N`ylKWpVe*nqxNNJXq2_^sl002ov JPDHLkV1mH2TjBr! delta 692 zcmV;l0!#h;1=$6VF@KXuL_t(I5v@~AXcJKoo_X2b6iZsQL2SjJgBKA`A_Wghsuffa zDzqMi_><(|vEtE#2d|1J1)G2fD%69=LQM>M&{Iz;denlyn3|G=W_Oz%zu9DCEjbAK z;O(3D%{SkhnfI3HKMn4sle*{bWuLRea!iDGD2G`VNqAmt$$yv6$KS4x`$K4QR-7Np z{!M_FgylOEJ3@3l6e7ARBpwTI0d^-jXkUIj#a<-X6;hGPvOgzG2Z`jXiJ5fJ3LYHJ zIJ=bmyx@HRb{5!uhI}OJQkadGD48S=c36#9`*2 zfzTB8sFdO=h74SM*f7nC$R=dyBBlbr|19TBcS@6S+{$)<69~2tw*cE%F?)Y}#2(P8 zwqoiFIYJW}qc^Jug+iSxM*ql;k2sU1taDrKjs5g-?tcWkI@MN8eab%jc@bYLQD&*u2(=q8r1MQ50Gk0E0oYc9UZ%_ zcGJ){?E2VW}uwXIj&$CQhWXazsI{9t~UIA zftcNjp?`lwM`vVDz$vf5K92^-9b23-FJJ87Wa6SXy|kRs2W85UHnT+-_;gSv$(P zIG-v=q89j{%Q+{}6^clyyjMiUrR0Eh<8Lww0xd~F=yyhu&{$q}_Ue&lur|Z>J&NN0 adHn^R9V{-eCz3q?0000`(Xm6IXh}G<`23kie*`xOy+%pB0>`|2S$)0V! baee&(y<%oGS?5xS00000NkvXXu0mjf5YB4^ delta 582 zcmV-M0=fN(0_y~jFnn_`*rHBsf&dmGq&71FiBgB6i z@;V&P^BPL2O(In@Mw~Pn^>^KFcfOpbmJQ`SgE&&!J5tK8m4Ax;LP|BCPQUMVI-Qlg zm5MmIUaeNsz%Wei2toBAc=H+u5Rvq}U0-YYL2I2>U@PqVHicZT`4`z z*IXHGZ#QRgytp67SqR5!_8(jTLL~qRg8s8Sd3hcV5Bs^T*=$zN&yy$EuiP~c`rEmv z2*hTbTo2K1w|{Sp$H%whICO-_XikAV?{P!QUpq|ZNtu(&Ah))BcQpF4$G(vHWE6@K zmjWp@-((^`4u}2EmnD~NTK~95B))Mc-@=Yg^2j)X*tnh3a>7+>BI6R-MJzgr*t8-j z_Uz2uW%T#C<0>Gf%*>c%oq0M&%w#fgdcEGylqui$U4JN+?OG{oR&Fsk$*yBufbd}> zDfI)6UE_;MV@R=F4$}5Rnfv=spF^?6EN40K29(>+d3i1a68tQtTDgTq&qiuF=T z695dcg^u|Bm|XU7V4%f3g&_9ms5jZzSRe3yt<`GPa2?yWPZ5Vv=qTG}e<&6!=p<`# z*-J8tB0ra763en~3X!DF3qW{)cssf5GqF+pr^N(f!3k$RTr2>9PZsYoMf}&_Z*~{{ UO0!tF+W-In07*qoM6N<$g7?)NCjbBd diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png index 38979ca5f930143c07fa3bf3f23bccbdf18e763c..8e1bc886b366331a573bc0190f1139b7b7ba894f 100644 GIT binary patch delta 224 zcmV<603ZM61c(BVFn<8TNklK;xAIw7kkP5>v1xvsR z#y+)*i;~EQBGIq3cYbwzCi=IBt)X3edCZOm^LD^ zE_$2}5Q-IY?Yq4PZQH|H-vP>byuR>--<(rN+UD?w#M5tj-C58BkPU2@MY@KSE5x)2 z2_Q=)Vy<}rDn)CBW4twpX#hpy4}oBc#9yJ!7XNG@%m^Jv_UPT?_6(rN9%Vfr>{(^J aKayUQ*j-eTI(uIL00001r-0_FseFnabqNX1DAelEa z-+VJ~W>%>aI&vIO7=}0V+&mMJi^iC!QYk-(qUg(XoSrru)qj2e#syF+s+tl0bw(fMcziTazpnjsw^SnJ)I6*{` z(J0?V=AQ)dprV&)8b2;HrGg-QgZs6@XG)N#(=@40l*md*f(p*Mz-bBJsJP_;85cBr)Az#{4uY!ez-*7WY$E2pbIy_o1XjOu7{uCMSRyzh zJn0_y!~y;#5f~|z-$kEJ@z-cHE)i?Xf?=5(3&I5gr+-FVLy{*&CBjeSdA~p0L~ppb zOkBktRcr;^%=!7b%ZD3lmyKCC9guJU2O_1XFs+cJR$ICSqU*42z*Z)9{FH9Dn?bj0 zPX`Z2%;{jW?U7TdO+*sjsL;ft5^wgmlI4U7NRy5-eM81GM$Z@#!68PDhS!xndkc!=h%ySvB<#g z%)Ix_x8Jt_iN9YwSR%?zWGpg6keVY(*vr> zArXFODSzJ1q*ldY{fDCZd_HRoB}n>0<`i)tYo({KZ;O~$^Y)`*xj}~CB35(p3KWho zgM>XTiO^?&nDsIw_p!!kGy6t&b)d>_lOs}GWZ6z=Djgw$5|H#;$=34ZUtaxIdM1QV z^klnr`3LOB)_*7*_@8;G2!(a4`5dmZ-ZA5flmV9U$Y(?c<(NqdnB9iG&`~n*nd)%7H=Ak72+w7R$GjkcyDi( zN|b~+zDr^k^yI8s1s_hc%SloyfHRNmN%ohHB|aF`pgRtQCHi5Exg{(!AlW<_*R>Rf zqsW|BTgJc-uhOn_5o{lb&|($6tOmXM@?!1rmWkvnlzjP_&twW$8iAc6MldhP^bmWO3Ag|N002ovPDHLkV1mj?AzuIh diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..e75e2f461aa156d48e69dcb183cfa3bd6381b09b GIT binary patch literal 290 zcmV+-0p0$IP)Px#+(|@1R5%gcQcDWLFc8fQmTp{m0dJr*pkBcvdxK(x6vc($qIdyUf{S8eU$q}n z38~9w^ZI7yJ>HZNVziI2nUt$-3DKWh7Fr*6ldm`;;)gNzKE#ZfX4aZ1G_{d{NtUVO z5ThhnFNs8D#6yI>*(Q;1NXpGZ2s3YI_@?##)N&z$62&oJnfV1F5WH(r)!o7`o~G%O z$Xw6^g1d7;i6Bx+<;+nIbWOm6{t*U=$d+&}5w!P$6ZMo%p-F_}!d*ChFZ~=Og0`y_ oxX}8zyy{NV+RCKpl*ah^2A*v`dQB`lPyhe`07*qoM6N<$f{NyQ)c^nh literal 0 HcmV?d00001 diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png index f67375cdeaaee4edf1df81079e19ddb23cf7d01d..e84ac6361aef3081aa741b9a215302faf35d4a07 100644 GIT binary patch delta 262 zcmV+h0r~!k1Fiy)Fn<8(NklCs$lNy2~e%56wxk1)rQGK zxCofIpy>ir6)q8=9$+E{1F%7$WDZTC;KYSXABH&45RhIB@!=%^0O^i7TR4#eM*si- M07*qoM6N<$f|SQ{P5=M^ delta 354 zcmV-o0iFJ?0*M2VFn<99v-V$5TOJz}g82nTv}-hcI>#AR8o7sc)!k=t|5 zogp28QjMAeh_xSE0@;-FHCZoYokbwsfLPmug)Cc{HjTZP)GE=^5z*(Bn0rBO64X}* zB`stdjRLu09v^1e@-uc3C@9dE-BZ#+&`NKBSo?k=arNu-1E}n1$WxwY2X$S)I`?%B zYNSZpfs&tg&|5+s#P8ZEsmQtfGQJbvu@Hhx62#mbOMampkL*oJkbJa#Rhv{2YPvfL zFUCxjF$Uj$L;lDuGe3yUYipZRsqq&Zn*aCu4afqA=QToWrT_o{07*qoM6N<$f`Xfy A%m4rY diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png index c36f293f99fbe92df372a0927e97e7dd902c5e09..31e5ec6c01c45b0c7013069a403290b4146d24e5 100644 GIT binary patch delta 181 zcmV;m080Ou1Kk0TFn<7-NklzT20=Cd>rV zOs*lwdcg*f;}Uc|^fic)i7|73Dmx<#gZN~*=>Na})uF5Y^MEviXb_()gMgZ3-hTSs z0@4hnWzY>`K^MTo&vBmf>;8WRh8%2ah&BkAM3{kwOu%LcNG^=Nv4+bP$l_oZfs#40 jASrB0^paxF0ICH5_ku5urtGd$00000NkvXXu0mjfiLg|K delta 369 zcmV-%0gnFN0hj}jFn@+LxAtHm30r4*F?t}D#gK#Dg32p}y`r}f z^j#g403sx9wL>M9HxUIpQ5e1a067Krv8|E{f+>XXJ0N*6Jk(t_^Y;Vj>{tjBKPO?l zb+^xNDy|EzXKKybffCOSx-~3hQki@k6{TtGw0@K6L=yzZo}y`gwS0Vz_Vgjzt~LvT zo<>DXvhiC8`f5e)k8u!W{e!qC!Yj;jE5uLfLVP_K43D&@dRTYC|6acU1-zB;{Mufd P00000NkvXXu0mjfyGNr} From 14cd58edd4e231165f88b245371514a3ee5195e2 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 6 Nov 2017 17:44:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-5284=20=E5=85=AC=E6=B5=8B=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=85=8D?= =?UTF-8?q?=E8=89=B2=E5=92=8C=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=3D>=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/constants/UIConstants.java | 6 +++--- designer_base/src/com/fr/design/gui/imenu/UIMenu.java | 1 + designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java | 2 +- designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index aa27ea2ec..3df47f30a 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -74,7 +74,7 @@ public interface UIConstants { public static final Color SKY_BLUE = new Color(164, 192, 220); public static final Color OCEAN_BLUE = new Color(141, 179, 217); public static final Color DARK_BLUE = new Color(0, 88, 144); - public static final Color NORMAL_BACKGROUND = new Color(212, 212, 216); + public static final Color NORMAL_BACKGROUND = new Color(0xe0e0e3); public static final Color TREE_BACKGROUND = new Color(245, 245, 247); public static final Color TOOL_PANE_BACKGROUND = new Color(232, 232, 223); public static final Color SELECT_TAB = new Color(245, 245, 247); @@ -111,9 +111,9 @@ public interface UIConstants { public static final Color TITLED_BORDER_COLOR = new Color(0xe8e8e9); public static final Color GRID_ROW_DETAILS_BACKGROUND = new Color(0xe8e8e9); public static final Color GRID_COLUMN_DETAILS_BACKGROUND = GRID_ROW_DETAILS_BACKGROUND; - public static final Color TEMPLATE_TAB_PANE_BACKGROUND = new Color(0xe0e0e3); + public static final Color TEMPLATE_TAB_PANE_BACKGROUND = NORMAL_BACKGROUND; public static final Color LOG_MESSAGE_BAR_BACKGROUND = TEMPLATE_TAB_PANE_BACKGROUND; - public static final Color UI_MENU_BACKGOURND = TEMPLATE_TAB_PANE_BACKGROUND; + public static final Color UI_MENU_BACKGOURND = LOG_MESSAGE_BAR_BACKGROUND; public static final Color POP_DIALOG_BORDER = new Color(218, 218, 221); public static final Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd); public static final Color TAB_BUTTON_HOVER = new Color(231, 230, 235); diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenu.java b/designer_base/src/com/fr/design/gui/imenu/UIMenu.java index ecce5059c..9c905a83f 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenu.java +++ b/designer_base/src/com/fr/design/gui/imenu/UIMenu.java @@ -25,6 +25,7 @@ public class UIMenu extends JMenu { public JPopupMenu getPopupMenu() { JPopupMenu popupMenu = super.getPopupMenu(); + popupMenu.setBackground(UIConstants.NORMAL_BACKGROUND); popupMenu.setBorder(new Border() { @Override diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java index 04d5d3b0b..3fe90dc98 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java +++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java @@ -24,7 +24,7 @@ public class UIMenuBarUI extends BasicMenuBarUI { return; } Color oldColor = g.getColor(); - g.setColor(UIConstants.TEMPLATE_TAB_PANE_BACKGROUND); + g.setColor(UIConstants.UI_MENU_BACKGOURND); g.fillRect(0, 0, c.getWidth(), c.getHeight()); g.setColor(oldColor); } diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java index fdda1a612..9e79ecd65 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java +++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java @@ -19,7 +19,7 @@ public class UIMenuUI extends BasicMenuUI { int menuHeight = menuItem.getHeight(); if (menuItem.isOpaque()) { if (menuItem.getParent() instanceof JPopupMenu && model.isSelected()) { - g.setColor(UIConstants.NORMAL_BACKGROUND); + g.setColor(UIConstants.UI_MENU_BACKGOURND); g.fillRect(0, 0, menuWidth, menuHeight); GUIPaintUtils.fillPaint((Graphics2D) g, 30, 0, menuWidth - 30, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7); } else if (model.isSelected()) { @@ -37,7 +37,7 @@ public class UIMenuUI extends BasicMenuUI { protected void paintPressed(Graphics g, int w, int h) { Graphics2D g2d = (Graphics2D) g; - g2d.setColor(UIConstants.NORMAL_BACKGROUND); + g2d.setColor(UIConstants.UI_MENU_BACKGOURND); g2d.fillRect(0, 0, w, h); g2d.setColor(UIConstants.LINE_COLOR); g2d.drawLine(0, 0, 0, h - 1); From 1514662e534b27ce4a1267cb622ff66793ea5a13 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 7 Nov 2017 12:36:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-5425=209.0=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E5=90=AF=E5=8A=A8=E7=94=BB=E9=9D=A2=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E9=87=8C=E6=98=BE=E7=A4=BA=E4=BA=86?= =?UTF-8?q?=E2=80=9C=E8=A1=A8=E5=8D=95=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=B8=AD=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/locale/designer_ja_JP.properties | 2 +- .../src/com/fr/design/locale/designer_zh_CN.properties | 2 +- .../src/com/fr/design/locale/designer_zh_TW.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index d1ea8fbd0..fb4812357 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -408,7 +408,7 @@ FR-Designer_Current_Preview_Rows=\u73FE\u5728\u306E\u30D7\u30EC\u30D3\u30E5\u30F FR-Designer_Data=\u30C7\u30FC\u30BF FR-Designer_Error=\u30A8\u30E9\u30FC FR-Designer-Website_Url=http\://www.finereport.com/jp -FR-Designer_formDesignerModule=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30C7\u30B6\u30A4\u30CA\u30FC +FR-Designer_formDesignerModule=\u610F\u601D\u6C7A\u5B9A\u30EC\u30DD\u30FC\u30C8 FR-Designer-BBSLogin_Login-Title=BBS\u30ED\u30B0\u30A4\u30F3 FR-Designer_Get-CubeGetting=cube\u53D6\u5F97 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 984a94a54..16298f5e5 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -420,7 +420,7 @@ FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u663E\u793A\u63A7\u4EF6 FR-Designer_Current_Preview_Rows=\u5F53\u524D\u9884\u89C8\u884C\u6570 FR-Designer_Data=\u6570\u636E FR-Designer_Error=\u9519\u8BEF -FR-Designer_formDesignerModule=\u8868\u5355\u8BBE\u8BA1\u5668\u6A21\u5757 +FR-Designer_formDesignerModule=\u51B3\u7B56\u62A5\u8868\u6A21\u5757 FR-Designer-Website_Url=http\://www.finereport.com/ FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u5F55\u540E\u624D\u80FD\u4E0B\u8F7D FR-Designer-App_ReLayout=\u624B\u673A\u91CD\u5E03\u5C40 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 997342c7f..898c1fb3c 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -417,7 +417,7 @@ FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u986F\u793A\u5C0F\u5DE5\u5177 FR-Designer_Current_Preview_Rows=\u7576\u524D\u9810\u89BD\u5217\u6578 FR-Designer_Data=\u8CC7\u6599 FR-Designer_Error=\u932F\u8AA4 -FR-Designer_formDesignerModule=\u8868\u55AE\u8A2D\u8A08\u5668\u6A21\u584A +FR-Designer_formDesignerModule=\u6289\u7B56\u5831\u8868\u6A21\u584A FR-Designer-Website_Url=http\://www.finereport.com/tw FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u9304\u5F8C\u624D\u80FD\u4E0B\u8F09 FR-Designer-App_ReLayout=\u624B\u6A5F\u91CD\u4F48\u5C40 From 51967e5448f29a4f65ea383d363c2f92bb57c894 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 7 Nov 2017 14:38:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-5427=209.0=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E5=8F=B3=E4=B8=8A=E8=A7=92=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=AE=BE=E7=BD=AE=E6=94=B6=E8=B5=B7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=A4=84=E8=8A=B1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/icontainer/UIEastResizableContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java index f5d7f23f5..81b291f41 100644 --- a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java +++ b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java @@ -255,7 +255,7 @@ public class UIEastResizableContainer extends JPanel { setCursor(Cursor.getDefaultCursor()); model = UIConstants.MODEL_NORMAL; } - repaint(); + refreshContainer(); } @Override @@ -267,7 +267,7 @@ public class UIEastResizableContainer extends JPanel { public void mouseExited(MouseEvent e) { setCursor(Cursor.getDefaultCursor()); model = UIConstants.MODEL_NORMAL; - repaint(); + refreshContainer(); } @Override