From ab37c265036bdca35816836b63f80b0d6cb803f3 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Thu, 30 Aug 2018 18:40:51 +0800 Subject: [PATCH] REPORT-10921 & REPORT-10935 --- .../datapane/connect/DatabaseConnectionPane.java | 2 ++ ... => Fine-Design_Report_Poly_Report_Block.png} | Bin .../poly/toolbar/Fine-Engine_Chart_Drill_Map.png | Bin 0 -> 423 bytes ...ewArea.png => Fine-Engine_Chart_New_Area.png} | Bin ..._NewBar.png => Fine-Engine_Chart_New_Bar.png} | Bin .../toolbar/Fine-Engine_Chart_New_Bubble.png | Bin 0 -> 503 bytes ...lumn.png => Fine-Engine_Chart_New_Column.png} | Bin .../toolbar/Fine-Engine_Chart_New_Combine.png | Bin 0 -> 381 bytes .../toolbar/Fine-Engine_Chart_New_Funnel.png | Bin 0 -> 1502 bytes .../poly/toolbar/Fine-Engine_Chart_New_Gauge.png | Bin 0 -> 559 bytes ...ewLine.png => Fine-Engine_Chart_New_Line.png} | Bin .../poly/toolbar/Fine-Engine_Chart_New_Map.png | Bin 0 -> 423 bytes .../toolbar/Fine-Engine_Chart_New_MultiPie.png | Bin 0 -> 861 bytes ..._NewPie.png => Fine-Engine_Chart_New_Pie.png} | Bin .../poly/toolbar/Fine-Engine_Chart_New_Radar.png | Bin 0 -> 1002 bytes .../toolbar/Fine-Engine_Chart_New_Scatter.png | Bin 0 -> 329 bytes .../toolbar/Fine-Engine_Chart_New_TreeMap.png | Bin 0 -> 269 bytes 17 files changed, 2 insertions(+) rename designer-base/src/main/resources/com/fr/design/images/poly/toolbar/{Poly-Report_Block.png => Fine-Design_Report_Poly_Report_Block.png} (100%) create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_Drill_Map.png rename designer-base/src/main/resources/com/fr/design/images/poly/toolbar/{Plugin-ChartF_NewArea.png => Fine-Engine_Chart_New_Area.png} (100%) rename designer-base/src/main/resources/com/fr/design/images/poly/toolbar/{Plugin-ChartF_NewBar.png => Fine-Engine_Chart_New_Bar.png} (100%) create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bubble.png rename designer-base/src/main/resources/com/fr/design/images/poly/toolbar/{Plugin-ChartF_NewColumn.png => Fine-Engine_Chart_New_Column.png} (100%) create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Combine.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Funnel.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Gauge.png rename designer-base/src/main/resources/com/fr/design/images/poly/toolbar/{Plugin-ChartF_NewLine.png => Fine-Engine_Chart_New_Line.png} (100%) create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Map.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_MultiPie.png rename designer-base/src/main/resources/com/fr/design/images/poly/toolbar/{Plugin-ChartF_NewPie.png => Fine-Engine_Chart_New_Pie.png} (100%) create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Radar.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Scatter.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_TreeMap.png diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index b796ab2d7..95ce1967e 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -102,8 +102,10 @@ public abstract class DatabaseConnectionPaneW$GbM*7%PAdv;(yQyn<&-5Bc{%3a{qx=e3;^=q;qT;( RG~ECI002ovPDHLkV1nT{trGwM literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Area.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Area.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bar.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bar.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bubble.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ab5c31315627b1a2771f42f686865d92f62b6c GIT binary patch literal 503 zcmVF(q^})1U>-^Zb81m(L&cUl zD4PJaT~XDkq@oWvVpZ&8cu|+!j_=?3Faw_={7Ihe)<;&*^=qJ1j2!|lXkm^s@*H7} zgGvHd==4JjbVb0CqVmur!}qx~jGZiropX9cb| z3?6sgT)VYXqVmN5Kq$u*-O&GykRq?Q{7&3=bKwiK1L}}gpxb$jzcWs-NXBf5ok7A6`}SmzyO=nzYE@aotOXs002ovPDHLkV1n2^)aU>J literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Column.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Column.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Combine.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Combine.png new file mode 100644 index 0000000000000000000000000000000000000000..9ff66acafd2cceee3bc61885e6482091515711b5 GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|O(Mr;B4q#jT`2|Nq-FFLfw< zmdvQIm7zoaj{kIBhR%%vCoeENtl>Yxp7_XzXG$|?fU`YQA!8^H+b*$`44Wy^3_NYz zBGNo2CX60Wop*LRIP)uTlV Y^^8PW{oP@~z@TIBboFyt=akR{0G#@PqyPW_ literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Funnel.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Funnel.png new file mode 100644 index 0000000000000000000000000000000000000000..c23759fba95068f901b15a1adbfa3c7b0c0dff13 GIT binary patch literal 1502 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pn}txArU1JzCKpT`MG+DDfvmMdKI|^K-CNkHWgMtW^QUpqC!P(PF}H9 zg{=};g%ywu64qBz04piUwpEJo4N!2-FG^J~)icpEP_pAvP*AWbN=dT{a&d!d2l8x{ zGD=Dctn~HE%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`V zEGWs$&r<-Io0ybeT4JlD1hNPYpzh2qfLoMT4D}VzfBF@P1^R}12Kv}Em1L$NoQI+d zBm>a~_7%i38(`2_ITxiSmgEj+$Q|p@#SB!^3j?Z?t=RYKG!A3i^~hHkhRh|X;!#r!^>-ZveJI* zn4iQ7Yd;UKU;k|C^8IbI(*rv8EfAHQ-}&J2zfj}-m!%IMcD{OhtLTY6Z=W_u{*X%C zd}_{~e}B)V{q=aAv1xPpl;%xG<=ZWePPSQ`rM)O6`?-E?=zNLCdTs|5en3E zI{oq6J8OY+9^4(?Q>vz!RG!kFw8C0Cf9Wl$SB5Jd?{|IK7&UKQ@VvjhTI?4ZWWP*w z@~LB;SZiY9HoJJo(a zl7Ap{V?&?Zgw^+Tut`FlM3&hWKdY(Dlqkg-+%c%`kPHy*RWojaPsWmvLDR1 zvvkt<**LbJII%|RL6Q5xn&wUa-dzp;tbS{D+ymuOr^cGAw%*NIr+1kj(fe&9&+~Co z1kd(sOq*^g$FXm0Ud|RfN8r)VCDo5|-jqhhpKMAytn+zIxc=RkxUGQ|=Xf96x&$(= zt~kLp|JX7?x1R?8z8yPhey)0jW~}Y`V=LpZ!}ZB-J>LYRXa^@%`LZxi+gj= zx;Et*s7x0*@_NeM1?fvy%82*8o2qR$r_d~FA!99Te*8h-dM~lRuG}B$-~Kx3dOz)M zS@iAHwzOcwotGGo8f-Ve_Ihv5l{G0J>vslEEDSKu+;#i+&o8qzc`9ypzIyUM{#nc9 VmV;+s0rM>bgQu&X%Q~loCIGo~ehUBq literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Gauge.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Gauge.png new file mode 100644 index 0000000000000000000000000000000000000000..2c62da86be9a23b8c3b02b2679cb139d562c36ec GIT binary patch literal 559 zcmV+~0?_@5P) zK~#9!v{gM$!%z%vA_lfpVqijm!~y6Ha)jKV?Zn#LAgo=|4KX#{87ej=GO)0P6F|k# z2`Sx?!e{iknAaDm5Vd5z{{&6bbap{|ZGzM5*Dj8P9D^f@R^Spm7k<7ts(to> z&trg&aAXFojpQR4z$dOC^neyPa)K_vDYz#x00ewaDHENXHtil$q0iUUdIDKPV0}Mf znsQ#vARlaa%LA@GTx6Y5WAe7xj`hV~eGI9P=z~*b0i{ z-f{kcdKEoh+bWiN92rHI63^Ycrv{b93b&ZfuIH}acBEy3A{L{jmj%alV%o4{Izfw> zFb#(WYwfY-=SHGpp1LMPnYK%E&qXpU%oIHG4CT0qL1D~}mmY)b1(j~_nt|By{ zNeBnv!5=_J1YK#GLWWzL-pv`owx9#EFEWibH0>fqn(=jN=l&N@r)CLFTKBQD;TG(Q xQVYgTkm73i8=GyXi#}-k=k4Uz^dIygzyS24*hWrHBlZ9Q002ovPDHLkV1nQe@)Q67 literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Line.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Line.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Map.png new file mode 100644 index 0000000000000000000000000000000000000000..2f68dcf8f93961ff2c35ad672f12f4fe2ebbd134 GIT binary patch literal 423 zcmV;Y0a*TtP)W$GbM*7%PAdv;(yQyn<&-5Bc{%3a{qx=e3;^=q;qT;( RG~ECI002ovPDHLkV1nT{trGwM literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_MultiPie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_MultiPie.png new file mode 100644 index 0000000000000000000000000000000000000000..b6bca9a3ebe316d1f83cbcd8357652531cdf02fb GIT binary patch literal 861 zcmV-j1ETziP)vCP|^=Aq{$;pU{n0m+>E3`b|ebZaBoG} z@Ci)a)eJ=Dl7(BgtpN+c5)^!kE3hQ$TpHzOe!B`7(gIHBJrvDIM6fn%bz+p*tCnZ( zY*a*Io!qdA;MmJ6X$^#t3^g$fiHjQ3Dwjk=U{rD)L?g&SDG0Bw8r&|mrjw?SO_+{c zWMdI%$EegXB0QgiY%i*L49aVas zXZ&Ijb(b7^&XN*;bR n-0O_nDgF5CfAqihM}PqUQ)GI6k}nhj00000NkvXXu0mjft-O5f literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Pie.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Pie.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Radar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Radar.png new file mode 100644 index 0000000000000000000000000000000000000000..754781f9fd9af3545d79eda9c8add80f3cd1eda5 GIT binary patch literal 1002 zcmV0se?bQMMXuUo9RefAhlw00QtP-;JyDNhH^Y$$Fg0q7M3cOx08&{Y>Sv(CwEPN z8HBZpjMrwCjq=&eiE+?|X#{Wq86a|OJi~h#d}f4o{urW?Ja&s*KLXT2xm6t&Obfsm zV1dk~l92~3KtIbo>%SH3Z5Z<2<4DU0BZrwhf)3PCS zWK=v?ja_s)on+Y!pcAO28#C|Ckee30BsT^lVsfe>>@P|7M|ICeHyR|lVSZJU7^{tV zy=zhv5q_yobFo*%bso4xBfKv&D;PU-D}K073fWjav~l%)6#g>kDdE}HXBKvBk} zB3XFn)yJj@pRUpI%b*QJL=DdN9Y_dH)MYJ2AU+2qY4I}%tWp>zeY$#(#?)soE+0w= z#$fLe(6})%=A^&_vk(w2?e*RqTF^&7oi&yXx(xz|n<4%H?4YXX0t#V`Z8o4OCdC=Q zmPm(yR4yqO$8vzzl!HPt>R>|9@A7FWjL(RJ_q!zSsyIpjVnqsdPre(4H*SLm2TcIQ zt_oNIC`nbc2T;NTY?y^RlH_r;mbe0@SSWzJHANquc=*+L3`tZv>lEN5qj{~2@}9Zq zIVQ6+#}siY4dPIUY1E{9FZjZegv|G_6;?H951`HydVfTxP<>NnD3+@`k8aCXdf#f! z8>mkA&ZC@6FMmcor!u0Z;Kpd>nkV8hPe?k-VTk94%C06>+IHRQ!-;{u(q#Y2{pr}W z)6SFvgvG+`Y~x0_Jh7sEhdG@uvZ%QvKJ4L^G^yhEx^mC5@oL7BkP{m!$9GR|+q8Vm zJ}#pQh%B{x)~Lh0$Vn&Nex;?=kC0t$F~%9AM(%7V%@unqv#2pLePOW~F`a7olql4^ z-{l@()}2&bXI*72XjMe(Wyh|X_yrTVS}4901{=a+T3nN^Xhfl+I5F^9U1op1ZrlK* z{1~Vp0=U(&g?|^DqJ#4p|9X!dTvD#hNI5qh{3ct~)@}@i5@&jycGIIHY;V}rAHM|{ Y00yv@$D4zJ>;M1&07*qoM6N<$g4>+GWB>pF literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Scatter.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Scatter.png new file mode 100644 index 0000000000000000000000000000000000000000..24a2aaa3e98b7bf970cc63f9122f74dfa30b1009 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP*AeO zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkDP|-C{7srr_TSt>Wf1Q9 z_(Pl|M&1+a;`6pGWL$sn!i~1<9rN|PbKaOg zxOCbjQ|j2#>76|{(hrDFe395=`fTA&4#8zNCaZ+)tq5k-=w76%?N)S(>(-RKB`unU zPuU|SSyB{?$P;}UQiC5tOL+hiW Vlj=7`gMmI|@O1TaS?83{1OPtYe479O literal 0 HcmV?d00001 diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_TreeMap.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_TreeMap.png new file mode 100644 index 0000000000000000000000000000000000000000..09edd2b77ec413c2eead3db6bcddafc3ecafbc74 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWNC@5Lt z8c`CQpH@+2u$DqB_b`ZBbhKY7Yyk0WJBDTtpeq?X MUHx3vIVCg!01hT#rT_o{ literal 0 HcmV?d00001