From 38a9445e4b2f7995c08e031e300c6ba688eecbd5 Mon Sep 17 00:00:00 2001 From: vsv Date: Tue, 24 Dec 2019 11:19:14 +0300 Subject: [PATCH] Provide icons for objects in object browser --- CMakeLists.txt | 1 + resources/CMakeLists.txt | 19 ++++++++++++++++- resources/SHAPERSTUDY_images.ts | 35 ++++++++++++++++++++++++++++++++ resources/compsolid.png | Bin 0 -> 399 bytes resources/edge.png | Bin 0 -> 284 bytes resources/face.png | Bin 0 -> 469 bytes resources/shell.png | Bin 0 -> 411 bytes resources/solid.png | Bin 0 -> 376 bytes resources/vertex.png | Bin 0 -> 533 bytes resources/wire.png | Bin 0 -> 342 bytes src/PY/SHAPERSTUDY.py | 29 ++++++++++++++++++++++---- 11 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 resources/SHAPERSTUDY_images.ts create mode 100644 resources/compsolid.png create mode 100644 resources/edge.png create mode 100644 resources/face.png create mode 100644 resources/shell.png create mode 100644 resources/solid.png create mode 100644 resources/vertex.png create mode 100644 resources/wire.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 758ece0..87b80c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,7 @@ FIND_PACKAGE(SalomePythonLibs REQUIRED) FIND_PACKAGE(SalomeOmniORB REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) FIND_PACKAGE(SalomeSWIG REQUIRED) +FIND_PACKAGE(SalomeQt5 REQUIRED) # Find GUI # =========== diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 57537f9..5f472ad 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -20,11 +20,28 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +INCLUDE(UseQtExt) + + SET(SHAPERSTUDY_RESOURCES_FILES - shaper.png + compsolid.png + edge.png + face.png + shaper.png + shell.png + solid.png + vertex.png + wire.png +) + +SET(_ts_RESOURCES + SHAPERSTUDY_images.ts ) + + INSTALL(FILES ${SHAPERSTUDY_RESOURCES_FILES} DESTINATION ${SALOME_SHAPERSTUDY_INSTALL_RES_DATA}) +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SHAPERSTUDY_INSTALL_RES_DATA}") SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SHAPERSTUDY_INSTALL_RES_DATA}) SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SHAPERSTUDYCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SHAPERSTUDYCatalog.xml INSTALL ${SALOME_SHAPERSTUDY_INSTALL_RES_DATA}) diff --git a/resources/SHAPERSTUDY_images.ts b/resources/SHAPERSTUDY_images.ts new file mode 100644 index 0000000..4598464 --- /dev/null +++ b/resources/SHAPERSTUDY_images.ts @@ -0,0 +1,35 @@ + + + + + @default + + SHAPER_ICON_SOLID + solid.png + + + SHAPER_ICON_COMPSOLID + compsolid.png + + + SHAPER_ICON_FACE + face.png + + + SHAPER_ICON_EDGE + edge.png + + + SHAPER_ICON_SHELL + shell.png + + + SHAPER_ICON_VERTEX + vertex.png + + + SHAPER_ICON_WIRE + wire.png + + + diff --git a/resources/compsolid.png b/resources/compsolid.png new file mode 100644 index 0000000000000000000000000000000000000000..6a1657089d602d6162708989332ba2135f26eb22 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hVVGI+W;hFJI~|M>sk-c@3?f~ExDlUk)Cp-jo?lE>2i8u_02+t*U>QQh{> z+?Qd~#SL5BPjGKYvz*VN|Mx`?^U=*=b@xl2zP$g|JpQ1ehp~~o8rv~B#ruwC<}=mB zZDwtK|0jRKGu`X+{@*S7do*4_dQHad-s$y@5|PGpc#RycS^rrdnRL%S*n}sDqvV;r zu!_!O(Y8lY8yFp)*Sm_fcq`p(@#cBfIx*|OuI~PSUK5iKge8cazft^bdtAt`TFdtz zVkYr0-1=c({_2su)WXi&4Hw@t__YSTI~d>a@h@}J=LZrg3>Zpcm*#Vu@yl;Le%D>z z=l4wQV#6gdE>pq;4<BVkI;iXMSR+rMdtCcQhfSXpak(+ZY0 zK~A35(32ut)_CmVe&l~?s%^uP8|E?!J8Zn397*Mu>#>*Ct9lXeLuJDYMP}JmD%ZtN XJTD2oy=8?U&|wUou6{1-oD!Mp31BJ-+Tg`>lVHFS2|mTz=Z1Ry(Ko0aM!{-RtxJ->>@1I_pOF|6?C5 z=d0XpzU(-yc~0HBl5?;2-_F~^qRpmxqvormL_W)|jK@#a|6h-<`cwb+sQdrxu@yh; z_toCwPl(8EuAIyGV#;NQ%XN$&{Wbe1$X}9EyuZ}edH>0ZwmMd}2kDXPH~4S5_fY=H z9_4$?vA@JR@)=@vIm{W3DTpVFs<0wqx&P_FKxfEKkgM`j28KF=r>mdKI;Vst03o@) A*#H0l literal 0 HcmV?d00001 diff --git a/resources/shell.png b/resources/shell.png new file mode 100644 index 0000000000000000000000000000000000000000..5144ea8d08778c39fa86582d1e8bcb2f67c6416d GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b zK=oHan9=rH#7Cf@M2TxeNpOBzNqJ&XDnmhHW?qS2UTTSgiJpO;WsY&39|HrUq^FBx zh=qUhkN^MeT_sj4XiD%ssZ}}>%9NZgc`WU(k?)zmeJ%Af)EF{#B5o-^VU5^4$G>HI zUCFV=N0Hk5^LKsv^8VZG^#zaCUXTAXcjNOj`FmG<`CWAH;ZB9wv(HTCmOFc^{GYkU z=V{sJ|K~AkF=?_q%r%c|GCb38XJvPNMvGeB1W@B9NdB2jip!~FNJb(F@NCq+qzF?ii+mM)`U^FqAL0VulgQ4&R z2C+%J43^R-+Nzsn#0?k?Kkw@9pK-#7L1Jsqfsz9pKI{qM6H*$cxN`*XE3qA5^VrE= z&v?vSV<%Ig9FuxdQi9cw=0t{F3@d?w@bQN|GsDW>-5ut~Z|ML7lEKr}&t;ucLK6T8 CMxEsV literal 0 HcmV?d00001 diff --git a/resources/solid.png b/resources/solid.png new file mode 100644 index 0000000000000000000000000000000000000000..dbffe4c0773b0b06a09f6afa03b941f4b39719a2 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=fts&@Fyn;$$~izmi4xa{lHmNblJdl&REC1Y%)Ao4ywnl}6Fmbx zvp+q__kn6&db&7{9C5il^kn)6sf&Gf7hok@4wAn-*L!+d0%r*o{_&^g-Q1PpZ68cMz6E| zzx(O0?)}jVD{l8rPw2VK5c&SY{RYEI&ua3 zN%Q*y{R2PPRKpd{IX`gm;qhUwpYmt%?#5ZJ2WB}kM6)TfCX1@b{ZD6L=*d6%f62ZO R1)!%HJYD@<);T3K0RYG(mBj!6 literal 0 HcmV?d00001 diff --git a/resources/vertex.png b/resources/vertex.png new file mode 100644 index 0000000000000000000000000000000000000000..6795c4c4e9ee5d36fe27906feef43543e4891f65 GIT binary patch literal 533 zcmV+w0_y#VP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGh)&Kwv)&Y=jd7Ji@pZ+&8Jur+DCUXYM`c-1|loK@h}Z9%gc5 zg$0Q5BbNy<*+?Et>?hb}rq(P%+;ZY?M9-dK(1pP|ws_#eFF9Eh zAe@2l>BNs%+itRn&F;xW>Y>e!9%A;-2%V80b=~=0u|>V&J7ZO Xgy1f#Y`A!I00000NkvXXu0mjfI?d^} literal 0 HcmV?d00001 diff --git a/resources/wire.png b/resources/wire.png new file mode 100644 index 0000000000000000000000000000000000000000..87b8556499fd6519fc72e7fcf9fa98f29ec310c0 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR43pu_#?G1mbSmy3nIl*y_*N85Y4AO0+0{={}emCu9q z!JAdp6Qi%mtYGp#@M(FQ)=Ca@2X2og7yJB-FS1?;N&I3d`Mo~)+PcHhhI^Qv%s6na zXWs&o#;FcL-xs$t<+~od*&>&)(CWu5+x^|o+wV7Mel%w~Tw%43eM9Kea~)RoQ@1_I i`1Wv~%``zd>umWKW_