From de100478f6ad164d8caa800500acd3d3c41579d8 Mon Sep 17 00:00:00 2001 From: Artem Zhidkov Date: Fri, 24 Jul 2020 16:20:21 +0300 Subject: [PATCH] Task #3236: Generalization of extrusion Update icons for the type choice. --- src/FeaturesPlugin/revolution_widget.xml | 4 ++-- src/FeaturesPlugin/revolutionfuse_widget.xml | 4 ++-- src/PartSet/PartSet_icons.qrc | 3 +++ src/PartSet/icons/extrusion_edge32.png | Bin 1139 -> 1134 bytes src/PartSet/icons/extrusion_face32.png | Bin 1518 -> 1654 bytes src/PartSet/icons/extrusion_vertex32.png | Bin 755 -> 766 bytes src/PartSet/icons/revolution_edge32.png | Bin 0 -> 1519 bytes src/PartSet/icons/revolution_face32.png | Bin 0 -> 1951 bytes src/PartSet/icons/revolution_vertex32.png | Bin 0 -> 1005 bytes 9 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 src/PartSet/icons/revolution_edge32.png create mode 100644 src/PartSet/icons/revolution_face32.png create mode 100644 src/PartSet/icons/revolution_vertex32.png diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml index dd06cb433..a3695aebe 100644 --- a/src/FeaturesPlugin/revolution_widget.xml +++ b/src/FeaturesPlugin/revolution_widget.xml @@ -6,7 +6,7 @@ 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it." shape_types="Vertices Edges Faces" - type_icons=":/icons/extrusion_vertex32.png :/icons/extrusion_edge32.png :/icons/extrusion_face32.png" + type_icons=":/icons/revolution_vertex32.png :/icons/revolution_edge32.png :/icons/revolution_face32.png" default_type = "2" use_choice="true"> @@ -15,7 +15,7 @@ label="Base objects:" tooltip="Select a base objects" shape_types="Vertices Edges Faces" - type_icons=":/icons/extrusion_vertex32.png :/icons/extrusion_edge32.png :/icons/extrusion_face32.png" + type_icons=":/icons/revolution_vertex32.png :/icons/revolution_edge32.png :/icons/revolution_face32.png" default_type = "2" use_choice="true" concealment="true"> diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml index aaca18add..206341ff9 100644 --- a/src/FeaturesPlugin/revolutionfuse_widget.xml +++ b/src/FeaturesPlugin/revolutionfuse_widget.xml @@ -7,7 +7,7 @@ 2. An existing sketch face or contour. Extrusion will be filled by it.<br /> 3. An existing result shape of kind: wires/edge/vertices. Extrusion will be filled by it." shape_types="Vertices Edges Faces" - type_icons=":/icons/extrusion_vertex32.png :/icons/extrusion_edge32.png :/icons/extrusion_face32.png" + type_icons=":/icons/revolution_vertex32.png :/icons/revolution_edge32.png :/icons/revolution_face32.png" default_type = "2" use_choice="true"> @@ -17,7 +17,7 @@ icon="icons/Features/sketch.png" tooltip="Select a sketch face" shape_types="Vertices Edges Faces" - type_icons=":/icons/extrusion_vertex32.png :/icons/extrusion_edge32.png :/icons/extrusion_face32.png" + type_icons=":/icons/revolution_vertex32.png :/icons/revolution_edge32.png :/icons/revolution_face32.png" default_type = "2" use_choice="true" concealment="true"> diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc index 74a83a9af..2f566bd1b 100644 --- a/src/PartSet/PartSet_icons.qrc +++ b/src/PartSet/PartSet_icons.qrc @@ -23,5 +23,8 @@ icons/extrusion_edge32.png icons/extrusion_face32.png icons/extrusion_vertex32.png + icons/revolution_edge32.png + icons/revolution_face32.png + icons/revolution_vertex32.png diff --git a/src/PartSet/icons/extrusion_edge32.png b/src/PartSet/icons/extrusion_edge32.png index 6a9607fb13dc1a6464b947dbcd7fdd21c3089f58..6412615c942efdaed788e40a4e969c0626c0ba24 100644 GIT binary patch delta 1113 zcmV-f1g87*2<`}wB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01m_e01m_fl`9S#0000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$T>q$gGR9J<@mu+ZUWfaH% z=efCgYfZB?Y1%aHTGovg`(cxH!iFr^m(5A-D#L*w%nu@{pnuHyRf_mQv`9g)prHFA z3@WUn)s4=Xc20Ec1yMq~IqA}+sZHyewMk8Ga_{lO)|%IvjF_Hp_nvd^`Q7Ko!@Uo% z$wB|eLmekimhp#;xh&^ePs7sdQ zLmG39)m*mpn18u!RS0lYiR(j=6^o)I!f|L{DRT6)`TqV$J^*CzJn{trj^Ksi!|6%u z@wcpHX45f)EWctcFVnR)G%oIH*dEy7s$G&uaC-eMzkkcvFV~tT@A}Il%IZtO!Tw)2 z1gPqG?o)tX1_bO|bQRvAAtgEA_~yH#O*Kwi=k6zNw|{PHSp1KdS&tvRUf1bMo|afl z?Gm|%_k08v#{n_|n)=th*#6|a{k6VwB0T=a;qI%23tkn8MLWBrAZuqvw4< zybgj10GNedBkE4Bk+9lkw^|ovy{r~88~~>7&Qub}7dkZ%$^fYD=zT{3Zv$*vyGO(_ zn0k}zWPhRCx5HVpTx$(c0Cd@kZ0)@}0j>oQobwFd0Kfpw zujTc--9_;aWLW_Kkci!QFxB&L_<9u6e@*}f4gdfF6Y05P`p*df&;bCDK;!9|V*1Yt zkbmO;yE9Yi`C{$=oB*ZtpB12#{<8v<(tid(sr_dFl-hp=K&ky_0F>H)3czOgPXX8r z|3K2$a6|uLU7N%4um6}5m43MLbDei;s@^|0>->8)VvZ{bS+CbA6&B0=mYpqs9D2Ir zX64q(=%mkQV~Ck-{?h@TB4qb3$R77^c3O zxc<(aJF`2x2@+-{KlshL_w2IgoZmh7-dUM3CT%4YVYduhp1`J-Kt7ev!Mq2$+>soa zjT4Y%O=2t-2nl=$^Fc7{526HQSw=jOj4V^7KY@?H+2B3^30#A@AN&rq$d?d@dliu7 z(D5mPzbnQR{C_E!AHXHBA1XWuzR#PGs^i-0(^Qi}d-k8mi|8J0FqkpEf!6X<2KLJVo?VU@|u0D=w zka}PNOd6c9T>&wzFC0{Ihy zwm3B)DLF?DKVt0h{{~~Ns(E1Zj3Ck1csa|yd z6o!)^?SFgP|4A_l(miqu{GJ>HN}y-$1;Xk{em@u{LRkGA!`G(hj%@-XK>(On@cuvUKduVrRVWqc}vT{QW?<_fHEOsU4mJ zZOrEA)T7gna9-FXpdCJ8f7b2d(Y>w{ym%tWCmrsNp1Ex+C)6IakADwz<`K$}7umO%_ z-oTR*nAf%J!oAx{ded*Z9`o34eY{ji=d%sJ(cCpOR@^tdw>+9H53f3Q<52O5-4nyR z%zrDZSC^kR5AT^Y_LR*`DeL&ov#YNC5Pt7#$bXVTbR#CIcCz@hE4v5ZHjn={u0Npe zHOD7@U#eVLt*?1IjM9BB^SqVX-4!FF8~Fhve`{sAYSrs*$taBA?r^Jh%PI^G7n+{a zux#5uz4m#g;#NrImyy7_3PcI)pL=?0!GFGVQS;K0^JG8Xy71%kImyt5q|YWl-g#_l zrl$c3oeGFoqyGgPHgD{M>2t4-ofv!b3(ra|jhZ8e^uYnuvg`KUTK!ykq`1$Qm{VJ8 zG~usc4{!5a&q$}zEnk+F9nY_*ieiE){^D3TVXt4PE~a1nar#@x-~E;qp(nHJH&<_{ z_ZUNkl%~%3jNM6VDND@^e$}Yic$r{36`Y;v0sRtvx3yL~;4=vyXZeS4DE<-x!kgFN>H@mOOnQZU6uP07*qoM6N<$g0>1BZvX%Q diff --git a/src/PartSet/icons/extrusion_face32.png b/src/PartSet/icons/extrusion_face32.png index bd4b9251dd6ee0cc24b8eeed15e1cf66b2e141e2..9fc9a5a1195b2e58dee281ba20626fd5a24c29b5 100644 GIT binary patch delta 1637 zcmV-r2AcWq3-%06qjejBW%c9W_nrQTcCh)-z zelo=Om|(;>R2D!73>4Xr$ymF!YuD13wYOdGIer*h1})w7CGq)ma-Jv8|JU=YhvGharSy8f#>(`vWQaKvkz{Y>I}9_ z8&N-Sf0bV)eg%P}qU$uA z8u&DV{(pXpKcUSERN#~VI^%*sg$m<(&9P=2gmX5Zn;%lLuv(k~@1~t?4Ej?XkO)VP z6W9nKEaVA+CYtyI0QLux+IF*O)^=~*HaHTU=opX1om*e zKYFAqU(}kOzOVP&Z-#zexd;$H^vM{2?xvnyGJh8;cTw=SInc=gM!@p`v2*ap0qoax zZ1bz`>`meD%-M;HT`Rn5VqI(4&yOe#qo=cCB1Ct!-_M84;hpoVGL0OktllHdmRWx#Fz7 z<`@c`^;}sFT$^it?!|jdf`HY5V0ttf4VfjWAX1ST0XTJGEaa5sfvtj}56{lN$Tq_SBV5I(H}sOSHR=U)l~uzz-U zbi~fbrUIfMlp1W7vJrq27cT@Ftk#mv#H$ty{ct~RiIw8 zDebhGEt+Drm;X#m`)!gnXG9zT&PAhscf%}mGL(_^FVSKm7Qq!9pOvFHzO-f|iM{+OIpIp@QReHRwX`cH-1S2hQdV}D+_ zVdU2{ZWImw0t44Hp^#3S0bp__>Cjo_n}yus3Dol+0M$A3clv!N29F)Py;Lrv`{ph< zWXH1NvswYihkijM8VMFFm4CCjV$oVCk&hP}FH+X=-`}@)lVlRuOf0@?d?G?afuJFA z0I*wZFqrL)O>Z%kDI5Kiv~YWuJ2*zS@W*oonjZmZRT*3b$=;tQcT z6l8K4oQqs)A(W0T%`KS%{yPT-YWXiwY_S2hTz(dvt5$=OdVeRX!(OR0Lf08463GUx zv#U;c@eWKM`h4^C8gP)6S~^WA=NKA3^|!>AMz&CpC?yA$?iu
rclRQkul3n6nB j8+-S)pZ|5E|1$mp-(Y^^CIZ6-00000NkvXXu0mjfz7YP! delta 1500 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 N002ovPDHLkV1mnkQ|kZ# diff --git a/src/PartSet/icons/revolution_edge32.png b/src/PartSet/icons/revolution_edge32.png new file mode 100644 index 0000000000000000000000000000000000000000..3327c1ce9ea826f67293e403bb9176eac142872f GIT binary patch literal 1519 zcmVR9kwhUTCXxnVYkWQ9rQ-n0%GGv zDLcJjUvff1Mb(i0e~xe8+9>YBJ$7*GK5wx;5qt-SJh z%E}irBZFn77ku=%HFfO=8((RfO>zK8jZg5G&?tUXBA%0!;h7FhE&8FaNl804RvaD5>rI%4tBc=clkyFQC6JSkZ?PG`P z{w6$V5Mn{eyu98x#qv{i@=u5XWyGK28_t0QmEC5S# z@_Hl^tET`kFv!dj2p!D9RRCPfRB9`)ToM(brbYvByZN3j6 zn4CoT#1c#@bT<5S5uoD$0FAck1@Vprnp*pMl4AidN(L=4&f*IArTG9L13+Ix-AMpH zgq>6&j!BwYO~jP|wqks0?n^+u<8Zl6u>b%-MpDXX@1Uyyz|HXIFeSl2{i(kJbONxZ zKfj?UDuOU}4*R?@tpNZ?v{+OEQh{(I($@t5V8*kN2BX*D^albl1DK6UNRlXNMgRi- z83)j!I$^u#R*;#cSOF}GF(3;$c}4&x>Yo5fjWX8OY79VSEvD^U60%B?FaZ;bP!~Xh zj|c#fIntK1qb5-n@Jl3E=g|ks6Ywjl8XN>>S_6bR06d{BP+jt{$7R z?WR@jDmEJpw#C_5{jmVFcK0TM#J@ww4!U&#^4F|U7`$!5csSB-R^-jg^XGTX+{32V z?VheQl|#+p`>4-wIAGca;yD1W^`1L(ezMK>&inZW*|2`qq9u*Z*RR^!db+IxuAu~v z->;YyQ!vhK@s%uC*jZ9kH0|_UzuRK-1+_!E0QTqBWre`|0DzhHL_TbEI_kWBZ}zUe zyWV8hKT|aQe701`awscjUgzeQHeJY_n>`%1bvgUu9d5VT>M&jm6HaNT=G=u}0a(Vs zNoT{E1Chba_MC%SC}akp0cZu|Hx_(_K$n>K4uN_ASXk2%U4w(kO}}0$_WHbIiwnmq za`Km^Mcq!vsg@J_FX&c)fPMyUBV^d2_jW?&Cqf!hO(TXs?_I9dJp%xMwS4_@V(C4o z>Zba}b1MPHidE$;H{09N1B7oT`#!RxnV!RxP002ovPDHLkV1mjrz_0)S literal 0 HcmV?d00001 diff --git a/src/PartSet/icons/revolution_face32.png b/src/PartSet/icons/revolution_face32.png new file mode 100644 index 0000000000000000000000000000000000000000..3974233fb66bc682e7f348447ec063099ae22419 GIT binary patch literal 1951 zcmV;Q2VnS#P)|L42=ES|+PV|%>Dj^k`l(vV6}Kt*X1 zf>e@J3NJ;7^dW&JePAhtf>4A?QG@^q1f^6J6%RjF_0Tpqc?mg#z=l}c8x!<`L_&*zc7)jPY{&>?|&9_aEyTv8y zSEbUc>!Mc(rM2d|&gd_mj(?~C@uN>YZ))0uLLt9&rB5=eUc;>Uyq;Rv>vhAvCK(Ad zRl+`h^$+J>@0cl;evo+f$4@uPr2;@~=l*Xyq&=5CJ(#;208>*Rxwo%R-_buX9t#BR zmQb*~(z7?FCWGfMU-~Y9h5!NpNZ>mFHz*n|6i*0TFRtkD7jAL(!JEOka>>4|JQ zvYI#m=$aw!Jx$ zaGaVxGgq|Mg81CF`zBSP#^Q&c{8U2#W~A%gY!a~srbiT&Z^m}+I|2aR$G)|WfadLe z{TW4&4Eg=V@pN*{Dzt_JbDO%l*f6zcm&a59AR-&g%VSc2B{83vc5^QPK*d##^~IxQ zO;aTRMEp&&BX%OZbkQx_HbzrPYdo1Y?b)o6oy%+aN=2P370GqoEiGStYHQ**&s?qp zVCLxt=W*JV;-S>pKV4XGScb8`uPt8s$Mt_TO{7!iWIAU}WKzb-zrQ_DtW?#C<0wK9 zdvwF`8b&4H_ZK^&v2i zb)27H9vx|0>eCd(Etkv2YT^LkH@sDsC3VMIvl8OKf?ohY;>;^AB~Sn5iIH zdbr6qcQ^7imxbRnDn!JZ>I<$4z(lFrAax%n$r!EH=6hbQRZw9zM2^$m8X8=G7d7<8|Z1x$tBc&A8 z+^oDdbhRfjbX|{xf~l5hY&O~)sYIet*YEY!#O>BNQi@Ww;@cSS7@o+cd_+{aGI+eY zB0yx<7vf-S1(1&gjJKC=Q3(1-EEt-7_tM3#>6`C|0Y_hS)_q(g%k|yi$nd#0&hH=sKDv1; zgb*l}N+^{}C>Bd7mWn7>$|7MWV+lJM1Ay(@cZ>nRL@E_xDTh}CSig6#G3)SA01$A0 zxir>(j!`we-h(F!;rW|Be4U lW2RTHv+?qkEBf-#zX8;B^l*I_bxQyM002ovPDHLkV1f+ql}i8s literal 0 HcmV?d00001 diff --git a/src/PartSet/icons/revolution_vertex32.png b/src/PartSet/icons/revolution_vertex32.png new file mode 100644 index 0000000000000000000000000000000000000000..ceab8d71bc10dae2a1bcd7a740e14f2f98254d13 GIT binary patch literal 1005 zcmVhiNv@GVlCog5TqEf8@rH#ts9{ws729=G!>DE6^T?RNYPfMj+0~(TF16Y zX5Rf>B)W(*Z{Ezrm1i|``Okko-Z`9m;r|}~MjLJ&J(y|l*%L2*JG~G^?^QZX^$s1l zEwitq5dfJ+g?D7fzHCdw0OoP9#Y(x(zTsE9dxy8w17OY_7P@0Gx%5=S0CHTHXfx^g zvgx-}X7F%V|8OdbVeYNhr!hM%7)y@4lx_$BkE?6H5`qMHqb}e|XW!8A%?~}kt(Ixo zbB7GYV{!LnLjV%%21uLC6i4=iAJe5&@8C0GriCLDIhjo%_L9xU>IN{g`3lF*L(Z2w zG#6ZZJIoZoWG9f4>A9s$n64t7q`dw6I3GCg(ZbpHXKED(_`NGJot|CF0|UUP)pV7= z02F{SARquR)6Y?h1CY%+Je?D+Crnm(24GQ=kMWCCdKkDW*`Ch6q5C2O00f#rmg;`` zK-Iym2;j-)&3L1&bnD&oQy+f`b{qg_V|4*|%m4&&ySJL8;tb4AeQ**u@%R70^N#v1 z7&p@pFv4nUYDQ^^E3pKCS9OO}-UI6jEPVFf55TWLva5f1N0j0Kg<}&%j1|mP-KNz5 zD#aH75)agogUJ>Rng=krxC-EEZo+j0q3wzcAhW_6NL`ncpu@qn<^dcx0WfQgTs@nO zfwh`#002fBz-0NTDcuV>I^Q$^W)A{5&qZFx7W3{m z_%m0y{9{u9$-c+70`~yLR7c|L$NKnL(GR*00000NkvXXu0mjfr1r+5 literal 0 HcmV?d00001 -- 2.39.2