From 62bb0d2d018d5810c1b2f7893ba016df9d814fb2 Mon Sep 17 00:00:00 2001 From: xavier Date: Fri, 17 Feb 2012 07:26:46 +0000 Subject: [PATCH] Title block template editor: added icons for row/columns/cells operations. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1512 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/edit-table-cell-merge.png | Bin 0 -> 634 bytes ico/16x16/edit-table-cell-split.png | Bin 0 -> 554 bytes ico/16x16/edit-table-delete-column.png | Bin 0 -> 845 bytes ico/16x16/edit-table-delete-row.png | Bin 0 -> 863 bytes ico/16x16/edit-table-insert-column-left.png | Bin 0 -> 1016 bytes ico/16x16/edit-table-insert-column-right.png | Bin 0 -> 997 bytes ico/16x16/edit-table-insert-row-above.png | Bin 0 -> 840 bytes ico/16x16/edit-table-insert-row-under.png | Bin 0 -> 929 bytes ico/22x22/edit-table-cell-merge.png | Bin 0 -> 880 bytes ico/22x22/edit-table-cell-split.png | Bin 0 -> 813 bytes ico/22x22/edit-table-delete-column.png | Bin 0 -> 1278 bytes ico/22x22/edit-table-delete-row.png | Bin 0 -> 1152 bytes ico/22x22/edit-table-insert-column-left.png | Bin 0 -> 1246 bytes ico/22x22/edit-table-insert-column-right.png | Bin 0 -> 1266 bytes ico/22x22/edit-table-insert-row-above.png | Bin 0 -> 1189 bytes ico/22x22/edit-table-insert-row-under.png | Bin 0 -> 1174 bytes qelectrotech.qrc | 16 +++++++++++++ sources/qeticons.cpp | 24 +++++++++++++++++++ sources/qeticons.h | 8 +++++++ sources/titleblock/qettemplateeditor.cpp | 4 ++-- sources/titleblock/templateview.cpp | 19 ++++++++------- 21 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 ico/16x16/edit-table-cell-merge.png create mode 100644 ico/16x16/edit-table-cell-split.png create mode 100644 ico/16x16/edit-table-delete-column.png create mode 100644 ico/16x16/edit-table-delete-row.png create mode 100644 ico/16x16/edit-table-insert-column-left.png create mode 100644 ico/16x16/edit-table-insert-column-right.png create mode 100644 ico/16x16/edit-table-insert-row-above.png create mode 100644 ico/16x16/edit-table-insert-row-under.png create mode 100644 ico/22x22/edit-table-cell-merge.png create mode 100644 ico/22x22/edit-table-cell-split.png create mode 100644 ico/22x22/edit-table-delete-column.png create mode 100644 ico/22x22/edit-table-delete-row.png create mode 100644 ico/22x22/edit-table-insert-column-left.png create mode 100644 ico/22x22/edit-table-insert-column-right.png create mode 100644 ico/22x22/edit-table-insert-row-above.png create mode 100644 ico/22x22/edit-table-insert-row-under.png diff --git a/ico/16x16/edit-table-cell-merge.png b/ico/16x16/edit-table-cell-merge.png new file mode 100644 index 0000000000000000000000000000000000000000..91a9993c926c8d4f1f27e3635e8caa90afc9b429 GIT binary patch literal 634 zcmV-=0)_pFP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igh~ z3mgjyogNJU00H_*L_t(I%cYaQYgADXg}?jW+ua0(U=jW(VHdbwu1MfWmVHmQtwMD&NKa{oGZK5bPD!!z$U!>lyGG}&#$~$stM{yi0j$^sBBjp{fe~&db)76WQvE)0NTuc;gZhHve z+Blr6i@DW+3uisf8){*H@6H>-KsFU^I`2R)>;6fs6ttK*519rx#FL!TCL)o#{ftQVPN<_9?=-%kNeI10g>C1 UJjwS^MF0Q*07*qoM6N<$g3ihpw*UYD literal 0 HcmV?d00001 diff --git a/ico/16x16/edit-table-cell-split.png b/ico/16x16/edit-table-cell-split.png new file mode 100644 index 0000000000000000000000000000000000000000..0cc176cdba06d41592a027b646d1ba77fab895ea GIT binary patch literal 554 zcmV+_0@eMAP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igh~ z3mhH(Nvm7{00F8=L_t(I%cYY&YZOrwhM)T}vkOMCo%L5_3wzN?SB=a3u%c=Hc*iKH-9)27`el zNkRw#0AmbUmXRb0-up(TwI<6l>|`>b)9L)>Ivft^cDw&%qtOUmlr;c;E`ag0T8I^8 zjgnvQBwV=$63(1;6cOtB&rZ>iC1?X>2?!{S&JVzC_N5k)+J|O|NVUH&#gm8PPIE=X zZT7`-GNve|;HvY-97XW?6YALtynIdV0Ur?WSUMS_UAm1J)4ZpxEqHJbE-j&-KEmF= zMeFfhXt!|bHa4U?U=5TF2FuH^@dmZJg73XTy4R__2k!~#4%(-?VDzli^8|3?CZYcx z{dNNsC|83u_;eRFxq4Zu+jpQkoq-U?ZK`StsIx-iR!jv@&hz4!_~Qpy>#fUS5ZNo7 z>=jN9gUITO=L@m5-nv-woN$yQYQypIVl2MR8UZAr2qf`07*qoM6N<$f(T>t*Z=?k literal 0 HcmV?d00001 diff --git a/ico/16x16/edit-table-delete-column.png b/ico/16x16/edit-table-delete-column.png new file mode 100644 index 0000000000000000000000000000000000000000..4fe000d9355b862a4fd74ebb8d9bc4f3a7673d3e GIT binary patch literal 845 zcmV-T1G4;yP)Px#32;bRa{vGh*8l(w*8xH(n|J^K00(qQO+^RV0TcleHL~xbRsaA2zfeq6MF0Q* z$<^P=)ZNO|-pkC^)2Ok6f`ab}3EG2*-)U{R1_tH`2&@JMuLcIW1_s**2)YIa!v+S! z2M6B>2!euw$kE)$)85I_-R&6~&bq?O!OYl$iQH^)f`WqW7Z-+xhK-Glm6es9ot>nl zq^zv0t_B9Mu&}eUv$qBYxCREg1_rykyS@Vh!^6YF#KyzM$iv6U#Kp(OuCT|0gvW=6 z$p!|>%F4?J2hGsb&C=G+%FfQw)zO=t(|UZ<#m3Xq)YI11)M#qds;ktpveeYo*oKDL z+1c6J+TDA5-{9fk;^X1sV}5w1O)7agzb@&?d|REh>GsubC?(p;O^7Zco1n&q4@7CGy1qJXI7w}zP z@bdKV_4o1F-0}1E@%8ueD=YGbhVu0G^D{H^goN|K!}Ig=^-)pvb9D8Dh4qSy_JM-; zf`a$k-1qnS_xbtv`TO|F%=q~D`1tzyoSph`aQfEQ`r6z2`uqC){rh-$`+$J^`~3We zhy0rKSDp>HYrx{r~^||NsB&?EnA&49c8g0000VbW%=J03RP8Atfs-FgI{; zd3kwxe}8{}fQyTZjgph3wAJYWKtc}y0004EOGiYMe`iV+0002oNkleEWJj)M(<)gWDK>QnOfTS<>&kwMQG`*2RaT3+AE;+ffKP}kP-+Dm+YWa26YT77IXP`?Y#u&& z`Iv#>$@4d_-h6ob{?ms~UrsnXTU%QL1s^|q{p8jASC_B9efIL>gGYNLC4u6bf#Ptf zXRqEaUHhuPWhb8r9|&p0?%v$3sXW82Ecww;ab76->2cJ?2C{-No8GiSlu z`;R|VRsa0+7umWuUES|mT0h>s57he~4F3K9|D(4TNPa6SLRR_u=G}MgouB&pw=pyS zXlny1c+t{wx4HRQSJ&VF|DR5qwu6mr7aQ9tAYx~~Tv7tm3-oVYePew?Q&U?_i=(AQglXv>zZ z3=BYH_p`7ZWMDYMz;FW|8sIPl2G`TqAD+K_`G$?{&FlB?4jy^;=KcGtH{aj6|KZv# zpr<}Qeeo$J_0xojpH80s^!5Aa&h9T$rha++^jl^1w+k1)FI)co*PkCdcm4SF=jZ(g zKmYvub>__P-+%u6`3v-2yhM*6F#bYHg8V>C0CT@cPaB4_|)#{`(IEwljuJ1)9p3{Z;AawC;yChoVu^Ob6X^D z+*v5})!C;+bfMrS&o^p3emgXGU(3CB>*=(09VtdiT}AtpZ|$A2dx=5o(ajf6NY}AD zF7OI}QIsLHppWl1yLF(d0CRx;WmbvZKT5R(^pE^{&iN>)^u0xLw;m|0JYD@<);T3K F0RVC%y3GIp literal 0 HcmV?d00001 diff --git a/ico/16x16/edit-table-insert-column-left.png b/ico/16x16/edit-table-insert-column-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e995036357b27d4af7d0dd8e2bd1ff35012ecb8a GIT binary patch literal 1016 zcmX9+4NOy46uuP&Az@oGp)kp2Hm77vq8o?{GqX^Jos41mnb?gXn}XIM3q&-5K^;FL z=sKlyEebM}g%Pk!S{4{#tD)NBDu0F2mO27ROMf2k@m^p1`tx?#zT|x0x#!$_a&pdX z$Vg8O4S6L501(PK%;rLUX~VV#K#tz?VkQ(uDK|9<^lG9k@DN;bIJXpDp4~7;Qgq7& z7z`@oe4G-bXKZ7H#?%h}&<((*xQw){6qurY+GUhhPtAuEAp*grt%XR-uoW}_a0P%S z0KNwx-|^2gY46&^kf$VdkH0{?t_d*}!IY295$yuxc)~{pk%E}6w zc7rzX+qj#5kC19y!KV=3C=c+^eFLu^s9mqsm)9D~?w^!WvRCbJ2$+c_&@eU6UD-?=RBdL6(+JO3rTBTH*edCie6B85D zW~Wx8)IL>eXJ)mt2AythZv3%+#ckAUpXs#=%c~2RfARV1qS?Mkc$ZAtr4`$fom{aX zD^|p8v6xqFW-DT`qZZ0*wOVZ^qYWW!Yxo+5qY&#(6nA0{Glo0yH7kKy3DWI!d0n`} zg(DQ@p(wA{L;7&q2iZ^iNyP6a{FKuV7fH}GwN86U8m9du?RU`|Q4icU6y}2yyWqcx zE#szVg0S$Yw_^6Zn+Z|~fC-e6j`qbMx@KZw1`3iy&ya3qyI zG%YVrgMI*q&B}_H`ZB*d;DyNe-1N;i1&JB_f%7|QW$~2t55t^V)P8nREgE|N!I{BLXKm$%xthJr^0;_HJirXo zl#$Z&s>b~2ymtyUIS+rI>m#lu?(fM%o@PkP7QA0m-HP2ix1VcEIM>Kb{x&-$rGxVk zzd)83AYA@ac#yw(_heus=iuo#OLwOqFIEfR>lvx)n`m}n^6~iF^Nmj;CR_OY#OaO% zt81xv{?3r5nbrD9hVawuv{BAf!hyHBtSf@H2C?{P&F5Jf9_KSI_j0`;Y-!*Az(7Xu d$rC#ow}8KSS&U#@AqEv%lo~OFHPvFd|E1>E-EVWN!M*n(^o!Pg%W`406zo# z3Xq_iol%cWYA+WSB7`JkQ#f(GcE+%2b|Vhuk`pIzbWjcCHZr-L+$go@=U+r<18U%( z;f;)Xvv|lxOfkgw#RJ5zoX`P74-5k^^}x~rdmXrX zNYDfC9u)uAOgVr6pbDS~Knxx!Mh^jOsQ_X+=KF);_3PmG*gvqvKd9I5?dEs( zZ{&&A@|tWH?>;GLF&6YVc+H5{>gILvN;=#(o}-)h2Y&0emA-KD`FugQUC?6?^rDK2 zipuHg+CfxTS9@>3-XKMP;Tl3Bp-?1qHuWo8B+Ay7mQIDU>tR=4zocJn9eg5{4)#ek zNH(Gv9+k@#?3 ztkExP^~)=Itqxn6k*}<-t{Kd0Mw0OOPG+$|r%;qkg@rWQNuOp;`g|YgER$7r4%NMv zO20p%;D-dT!g7Q)M+-`6qqoIo;+-WKH*RP~&0&p;rpt!~i9X4PZyzcrRfS*R99vrG z{idgWtU-1#DU|z3UG|w6R=)bcJhe3VnItVVzP>#*s`-{qoBm7n((i4V#P9n49DesG z>5Z??9{z0i?n|CTPU8Ok-YMMNk9MB;JT)MgKn$;aOkuw78MsSH<|KQ9A(`26Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igh~ z3MdN4a<^Lm00PKKL_t(I%Z-yuXq?X4je9LaSn&ey|7v27#_SjbZ_77ebM06p?Pu)1H?9EKErT!S9T)1yHfp6%Y+*Xb_F%@Jj2LMXOw)tQG&3!AHd3jHteIg#XY zIgO$SRYgQdCX@KShbo8&?Xh+aZ$F|@C6x9uR6bBTJ`<{sq4daoE?@q6L+XX`iyQQ% z@k@H`pX-(hl(Se>RXL00M|9iNwo&6Zs(=Oc0ZZVnt=E2}o9-&Fw7o1py>!0Tok{!h zz2H18mDhLf`RKvGgDY}$BGi>ih+`BF!bZSS}X2P0>{d z6_aXZWXz-Dw=go+#H7+R1I70}&^mp zpJ`$584D%=ix1odW**JEnCA5Q&8U7nH6Ki?>SXp*O;vSrYCiZwRX_Q^H~AOF|E6{u STaqpS0000y=qbseFT?tm5NJsoy3kI zg39|~!3u{CnWQCRv9@lKQf(Qri50l1!x3y_zxUs7FFp3T@5_Ck@7o{Wdz6I*qS%-< zF#v#AalWt!`c;p0MFg~I>2VV15LuB(0Q8n;-7tv$D8EDoi|vmU5v28e3LiN~#Bb$s z?ji|D%4-uHgKF60E!~m_9Q#@H0hGWc?LV?dnY)Pl8>b z9qcpj`}`6S3b3FJY*wI9wwt%ZEnoyhmE%$6#FJ8-BPF8Cy)ot9rz!~Um6VnJAg&** zswCnyAYL2)v<4&|CfCY*>pmex(v)k|7{oCoBce@w<$K!*GPz)mo77~EdfTyAu4np4FDH0Bp7>vv3Ct&G{o&8|Q9%%+cH(}xeP`D(+3%w1fm ztnAkdDt>L%!-|N5!<(}YDa_rHvUckePHCd+dd8buxZkYSI2?}sXWn)wQf)8n@pDZQ z9g8-;tSx(><1KI=EoV@h3O4L?TRbQG`cqSfHkv2z{qbH-_ShhgmnD`6b5E{|Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L011Qu011Qvs^VjL00007bV*G`2igh~ z3lb4&e9HL%00QtyL_t(I%k7jsZyZ$=hMzODoBfJ`L?TEO@B<>*RsI1=fr#i3OJ^Bk zMHEyi5JD)5Z1>1Ljgx}XNQolhYKw@`r#(&Yhi^`%>(B<6XxEB@(Z6 zit|3_o;x~oX5hajJ3Ks86h%nF%!uQdx~`G5Sa=Rw_RWkC0t^NNoz}s@fzH!;Y}p?S z25J;V0YFvNG#W8^p3n2sI*%>;jYdpS6g0f|^8$d0doj(Uur#%p(j~88@yj!_9^QLw ze}7-&@t6<-u}Z3|>!fK-Se`LP^FmBHsSz((WX8pdF^wnRQCpKJidb1$fqQ#+byDIi=l&uMrtI2I$-|?P zp@XQ|qTOzBAvSWKW4pV%8V>(P5-mJGzq7^tA4k0XRzy)pth9}GE8@wQB>-1Zu(b}C%kB&y_-WutrUlOSrNq(dx zNt7gs!BG&(_zGL^pQO`X2i@f%!L}lU~s2LhepoB8Y&?ukrcD zN4UC+nepb8E3mnFQ$;2Hl{giZw9&sI)tT}ae=LOROrQ2YIKxzD+UVa{=&`wZQw{G6 zvMeVZk1^mlGlr=#9t*=}&m~r5{Fy}y?8HCLY@x?&#yP!ShY+CG>rhPmEH`ZS&Lrsd z+Gp5Vf7-+Q9P9V{a?VYw%;k*EY{VQnpyGxA0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L011Qu011Qvs^VjL00007bV*G`2igh~ z3llL*3EOZ000ON^L_t(I%k7lEZyZG&#Xoa9zIc~&u#yM~ghWJ5C}^Qcn~GG(G)OVZ zA;JGZC}N3%&VK-w9EzmE5fl`bq65*zO^T$UpopX7;_T)2W@q--qu7gczB?C`NIdCV z%zOKNGkWu#h5s7N!NGxM32QA?RW1GaG;JwA7z{Lv{r!ENhSRipelQrwh7bU#sv2t} zy!XfJlc!p)&GXhqgb=W=NNXbiUgjPFO(!~GEMSy}1x?eQSr6|$W^Zp#S(YJ*Qid-FH)?ye-Ms2T-H#m)`=TNFDt+TN;> zB;DHGRVRc%Q8jq)2{q{P5Z8cnZh3`(d-Ra(v#U4>*R(yMZX+nFrp-9_IbGX9>Y@nr zWJp=pP?n4HcIFJ+y$k(om|uURHUrpk**49mRybm~6Fqt@91*bVv&;Vh03UovbLZ#d{dM@1 zRSPDGiQ_Kbdn~|LUv7egOJaWV4KIyZGRLqA`01l~^*9W$X5jO0z9w-w7{mDs7ogw2 zuDp<*rxUqSy1IEyLrH&!`a}&SeY&~1pbgdbxU%)g3#s3~F5718$R=5PvZEK6k%LLb z>#&7+qetiHXijT+bM%6I^4epXaZVg3G!4W_f)6=y(ynK5nl{hJaf0_bW@BSR&N+;P rj3G%9oO8^lES760_!*D?ag2We{HBgpz97Kr00000NkvXXu0mjf;2VBA literal 0 HcmV?d00001 diff --git a/ico/22x22/edit-table-delete-column.png b/ico/22x22/edit-table-delete-column.png new file mode 100644 index 0000000000000000000000000000000000000000..6d5a8184048a0a842ee860d73d17f73eab6cb4fc GIT binary patch literal 1278 zcmX|<4OEg>7{@Qtr)kZl&dNL|=WJ(jTxQ?a48_DsB}=lLmZr|>G5o-^BoT01MPZ26 zFl!>EsG+sm)XKCEo!XYVD1{_vPQX+IMS0;3?q0WZ_B;1^{`Wr5dG5LA{O>tRXpp__ zN?QPceK466j;ZrpEW%@XI=O5yCb-P-Ab(Kz!gUloEKVaI&cvi(E^syPj-SGc3+cfj zfeRJ5Tv;+-2tXA8KSMaNV1bFlK}90?FT=`_ z;kT;42UR-&-~o^d03U#H09Y&*He2iXNhJXHJUpL`n_eo^o!yGgo;O|HircH5-yDrs z#Ka43+z?14w;P*87!`Af#bT*cTI}P^WahD$%pL6BfBqSy#CM6{$Cnu++(bCh?>2!Kl zR#r}SHiMDNU@$mrc0obG*|TT4$76XsUSVM&pU)SRloXei3WdT_skHRoy|ViHYYFi` zRfx;W%SAk%s9Yp&XsoIbS4pZRe1W7&B9T;8@7z)&64mbBS}PXclGfF)bGx(g%ZB!j zhR&}0y}b_}Ha}=+}ZQ6r!6( zbP(#DoTfZKGx%)P!2h0GRvw&2qWfjGE0>Gio(Mh;G<`%4FyV3u=X!SsyO)KFrQq z^7AcnIcA*Ib%m8qx3bw*F4xMxWVJ#o=4)OaEGvV9gK$Iz)oQ5GV6}C<``xfl8B7lk zJ%H)|;P807o#Pt!wFIwiyNCgSWHLG8+q8^~)46lxbGU*Mq3}j!RqL~7ZO>nH%j636 zsD9djpjM2WvEESZCS2U!Ad*6h_he&xelUr6&}BvHC(GT4kp?K_S5$j`Su?R7p^7{R&w)e$OuXp(N_)FGZ z|7Ieo8r2)3HnrFh{JPGhtLLXNV|{nzPG8Q}#`$df(eCca^~ACZ3|-gV<|`>(m;P$X z@L*hZ>8Q^eBQS{a5h}<*Qcir@7IXUgoA&SeipUT5o+H#m-dYpYu;rnRCj%ousDI7it+w+Ql9RS;)@H6BN%)TOBIJ4~SooLz2n%U9ybxDPdV+=9vhw zGL%L8DDzIMo8Vf}?5u~4tF~j+t5I8dAJO<*PA`>*QxlRK){-uVZFb=n?OJ~<8n?)W gy=VUS$X<6-%b+Evp+Omfgv@y!92iQf^FPM^2h(D(Qvd(} literal 0 HcmV?d00001 diff --git a/ico/22x22/edit-table-delete-row.png b/ico/22x22/edit-table-delete-row.png new file mode 100644 index 0000000000000000000000000000000000000000..9537003d928f533903686b98c9310116a1d8b970 GIT binary patch literal 1152 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 IM6N<$f|z_%%m4rY literal 0 HcmV?d00001 diff --git a/ico/22x22/edit-table-insert-column-right.png b/ico/22x22/edit-table-insert-column-right.png new file mode 100644 index 0000000000000000000000000000000000000000..efce34904d8b10accf5a62b10b2f49c7228a106a GIT binary patch literal 1266 zcmVPx#32;bRa{vGdga7~ugaNAJV|f4o00(qQO+^RV0TTfbJNmZOY5)KL24YJ`L;(K) z{{a7>y{D4^00eSLL_t(|+NF|zOjTtV$G`76=ibXT6jLIGU_XY~tWDeeBTXx_S${wU zxZJF%Ye8E!S^qRAt2V$ys^v6o@F%ahnQ%XOT{q`py4n=0jkO3tGOpY>y89+iA3J{Ti z^~0t3r7wp2RA8`*kh7WLN)+P2zClw{6WvPrHjNYUn{w6P8MHIuZ8qkT>{!FBqE>#~R zTCgGQ*9W~Gb#-+Ffn-{y*p{Gcx-W1IP&oh>nx=d5&nb6n3avsA1(Xk+c8D$WfP z;AlawKPRwOcx=KYy5T1mV)AVsTO&a26E0Tmmr=jaM%M)iqdEu3tAmF>$Nw1ukN3B> z1Re`NMU0l?hkbjIR5?6yCIZNK3GaTs7xS_tbaw&=&$<{l%F)*PEmGDEj~&N>Penxq z*_>!JW%wel6H2dooE+1Ad7x~VE+h@w^Sedwv^hksE^uCjG$jKxd?W45a$BVzCw|ocL~C9q-oEaT#FXlAeBZNzv;08&wRY_ylox$jkt} z-l$4l@3Cb5l*rTwAKkHPmKyIkK4r|-Q!#B^3SIl}T<&ts-&m65-H*-4{qy1(E`b5L z4-s!H9Ly)T;2eN|emm!6KKpSxZ`YcMLr)bcf5b2G((P~P<3ouk8&u^>(;mEhocdSF^m8r>M7owHsS-kU!1?XmJ8}`tFNuCy&nG)m-8|rigV7Z cf}wZHzuIRR<}0KAZvX%Q07*qoM6N<$f>dHm>;M1& literal 0 HcmV?d00001 diff --git a/ico/22x22/edit-table-insert-row-above.png b/ico/22x22/edit-table-insert-row-above.png new file mode 100644 index 0000000000000000000000000000000000000000..4973e62bf51a8afd67b3857ce3314babc055ba81 GIT binary patch literal 1189 zcmYLHX;71A5Z-7}Nja=k4$-mIs?4-AVi{2J7)4Hj)B>GKhtViXRcKKGl}f8JEd&tj zpj9y-5GzLlDGUSznsNq7h#^RWD0pz+gycIy@_otImtWnP-RIfo-Q9U-b~BD}0&Lmq z*Z^P~6zCg<&~eFEEk_YMmuHQDl@J!-17g+sDU?{B4~$Ge@avMZgu~IvNL-m16zaF~ zHOqmuk=3|qwG+UyTSr17{LmAiLLRVVh*uM4fcFeCf;C(g1P*8Ueb18Ds*p zwVJ-3H+`e@SYLs#R!c!!QY+lD4IiQF%C;6Mhd@zB7rtjZg#d5LmgudI+wG3!B87+!|d!Z`|OQW4SYwd1pAY zSj9lpJRHY?ivbshQ;TrQh+04bD`FO`&uDF9wRW-EkF#NI4me-XZAj8>t=i_6qW>}# z^Q`dPl}_$XC%w}NZyvcPo!HAG_GS?KdH8-5GjX3R;?Ql2e~u+sVi(HCLhDv@u9Ty{ zMLx!k<&(!V%DGjBQ@rZfQYyCIkR)2X+C`=0iGQiXt~b%Y^-@`#WOltVyPNs_Z_~Xd zia?`FxdiMjDPY+`DD zUT@GY(hE9#0V6TOKWWQ+`B znq#PGh9Vfsz?e;pWog+nmn!YiL2?qqIN?i|3D#^oCl}ZCpKRW`=k&P?KV47de_~u*7gp$x~I2)VBpQj$k@c>)Xc0_i<3qZMVl@E8|gv>pn0s5!2!On zF0(K1Lfk9J_h5u`Z#4IS)y=%H@74^SNwo=CKfiycbmWR!wq+kXe*CK9@rN^c^~u=y zmVIf-2{*W`n@8_DuldVO#m__{hsKZQ3)-{$J&f$0XG$XU$5D75@ic;d!Sc=^;#?9hG0QzB@M+3yzufq;uwA#ik96GOUu#p9 zep&l=pw8YuX}>WQNPPC)&SoIruzo?TWO81J{`5LU0?}7+112O0KxR c!QDf>8elOZFX};We8bXyg8VqXVjphmf5A?x^#A|> literal 0 HcmV?d00001 diff --git a/ico/22x22/edit-table-insert-row-under.png b/ico/22x22/edit-table-insert-row-under.png new file mode 100644 index 0000000000000000000000000000000000000000..2926def680d3890eb5fb3bb088c65cecf89c7e24 GIT binary patch literal 1174 zcmYLHc~BE)6n{xnQKnX{Jat6XR;T9AtAObb8*{~b3n@zTx{?p&gd%y3!@Atm<&AgW$63nx= zakc>f`@n<#p$t1%Y&nPV3+Ich8Dd=yHi=a_C3^a|Mhr4QyiZk!cf6(*V;Jp9b&?Kng62S%4e>IY1}S zFKCFyRz#V%a1y5iTBQ%x?QRGu2j8m3htYVf10k}or>?t!2HrMzjWL$1K*p0`(G>!$TkP$ zn1k|lK~*abSFa4^<3|$;k0l5riuGUJ*F`=wL<Z!yUZCVX+ zd&rpCL*G$hS^0vjVquno%zHxo+Gyk#3Hgl_zlkbV(SlNeK&chB&;O<}moXUAi^XDz zL?RVQ%ZJE{%14!Dg358cs$5i6C6iT%s(a_Fhtay~$BIEj@myO!g*}nW8fNh3ruyb* z%`L-oN@bf8F|@TdcFaM?S0fg~15(r82}qmeR^8Z$-E1Wi*YP3dV9Nt>A& zlJtKh*@kv98yI{gG&sz%iomh9c3kV~y57xw_mLB4;%+3T7nha_ghHW6R95y#R;Orc zX;G8SIGbd5$aUWD3&pBUxUX>a*)crYxb5XLzTjiGJ)0$7-X1$8TiibL>=$=#Remy> zydkE$gnwe)TiMXMOZRGP&hu_5q{a7YeYj0J(Q}up#~m+;O4L4a`_PLn?_9I>UY63{ zA2h8IkB!Kpza$#}2o&3_wqF`B67D2qn>cJPo1Mhwa*~obZknU5OKR4Zb7Ge{vti9- VLE`Jz>P?pU1O^2AOZP`5{R`y2k>~&b literal 0 HcmV?d00001 diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 47eafce12..961f994e6 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -36,6 +36,14 @@ ico/16x16/edit-paste.png ico/16x16/edit-redo.png ico/16x16/edit-select-all.png + ico/16x16/edit-table-insert-row-above.png + ico/16x16/edit-table-insert-column-left.png + ico/16x16/edit-table-insert-row-under.png + ico/16x16/edit-table-delete-row.png + ico/16x16/edit-table-insert-column-right.png + ico/16x16/edit-table-delete-column.png + ico/16x16/edit-table-cell-split.png + ico/16x16/edit-table-cell-merge.png ico/16x16/edit-undo.png ico/16x16/endline-circle.png ico/16x16/endline-diamond.png @@ -112,6 +120,14 @@ ico/22x22/edit-paste.png ico/22x22/edit-redo.png ico/22x22/edit-select-all.png + ico/22x22/edit-table-insert-row-above.png + ico/22x22/edit-table-insert-column-left.png + ico/22x22/edit-table-insert-row-under.png + ico/22x22/edit-table-delete-row.png + ico/22x22/edit-table-insert-column-right.png + ico/22x22/edit-table-delete-column.png + ico/22x22/edit-table-cell-split.png + ico/22x22/edit-table-cell-merge.png ico/22x22/edit-undo.png ico/22x22/element-delete.png ico/22x22/element-edit.png diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index bf8509aa8..d0695185c 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -62,6 +62,14 @@ namespace QET { QIcon EditPaste; QIcon EditRedo; QIcon EditSelectAll; + QIcon EditTableCellMerge; + QIcon EditTableCellSplit; + QIcon EditTableDeleteColumn; + QIcon EditTableDeleteRow; + QIcon EditTableInsertColumnLeft; + QIcon EditTableInsertColumnRight; + QIcon EditTableInsertRowAbove; + QIcon EditTableInsertRowUnder; QIcon EditUndo; QIcon Element; QIcon ElementDelete; @@ -219,6 +227,22 @@ void QET::Icons::initIcons() { EditRedo .addFile(":/ico/22x22/edit-redo.png"); EditSelectAll .addFile(":/ico/16x16/edit-select-all.png"); EditSelectAll .addFile(":/ico/22x22/edit-select-all.png"); + EditTableCellMerge .addFile(":ico/16x16/edit-table-cell-merge.png"); + EditTableCellMerge .addFile(":ico/22x22/edit-table-cell-merge.png"); + EditTableCellSplit .addFile(":ico/16x16/edit-table-cell-split.png"); + EditTableCellSplit .addFile(":ico/22x22/edit-table-cell-split.png"); + EditTableDeleteColumn .addFile(":ico/16x16/edit-table-delete-column.png"); + EditTableDeleteColumn .addFile(":ico/22x22/edit-table-delete-column.png"); + EditTableDeleteRow .addFile(":ico/16x16/edit-table-delete-row.png"); + EditTableDeleteRow .addFile(":ico/22x22/edit-table-delete-row.png"); + EditTableInsertColumnLeft .addFile(":ico/16x16/edit-table-insert-column-left.png"); + EditTableInsertColumnLeft .addFile(":ico/22x22/edit-table-insert-column-left.png"); + EditTableInsertColumnRight.addFile(":ico/16x16/edit-table-insert-column-right.png"); + EditTableInsertColumnRight.addFile(":ico/22x22/edit-table-insert-column-right.png"); + EditTableInsertRowAbove .addFile(":ico/16x16/edit-table-insert-row-above.png"); + EditTableInsertRowAbove .addFile(":ico/22x22/edit-table-insert-row-above.png"); + EditTableInsertRowUnder .addFile(":ico/16x16/edit-table-insert-row-under.png"); + EditTableInsertRowUnder .addFile(":ico/22x22/edit-table-insert-row-under.png"); EditUndo .addFile(":/ico/16x16/edit-undo.png"); EditUndo .addFile(":/ico/22x22/edit-undo.png"); Element .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-element.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index d71b8fed5..11d7d8b03 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -70,6 +70,14 @@ namespace QET { extern QIcon EditPaste; extern QIcon EditRedo; extern QIcon EditSelectAll; + extern QIcon EditTableCellMerge; + extern QIcon EditTableCellSplit; + extern QIcon EditTableDeleteColumn; + extern QIcon EditTableDeleteRow; + extern QIcon EditTableInsertColumnLeft; + extern QIcon EditTableInsertColumnRight; + extern QIcon EditTableInsertRowAbove; + extern QIcon EditTableInsertRowUnder; extern QIcon EditUndo; extern QIcon Element; extern QIcon ElementDelete; diff --git a/sources/titleblock/qettemplateeditor.cpp b/sources/titleblock/qettemplateeditor.cpp index e233c98e6..6c11bc6ce 100644 --- a/sources/titleblock/qettemplateeditor.cpp +++ b/sources/titleblock/qettemplateeditor.cpp @@ -304,8 +304,8 @@ void QETTitleBlockTemplateEditor::initActions() { zoom_out_ = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re", "menu entry"), this); zoom_fit_ = new QAction(QET::Icons::ZoomFitBest, tr("Zoom adapt\351", "menu entry"), this); zoom_reset_ = new QAction(QET::Icons::ZoomOriginal, tr("Pas de zoom", "menu entry"), this); - merge_cells_ = new QAction( tr("&Fusionner les cellules", "menu entry"), this); - split_cell_ = new QAction( tr("&S\351parer les cellules", "menu entry"), this); + merge_cells_ = new QAction(QET::Icons::EditTableCellMerge, tr("&Fusionner les cellules", "menu entry"), this); + split_cell_ = new QAction(QET::Icons::EditTableCellSplit, tr("&S\351parer les cellules", "menu entry"), this); undo_ -> setIcon(QET::Icons::EditUndo); redo_ -> setIcon(QET::Icons::EditRedo); diff --git a/sources/titleblock/templateview.cpp b/sources/titleblock/templateview.cpp index 4d41c7291..744a89b24 100644 --- a/sources/titleblock/templateview.cpp +++ b/sources/titleblock/templateview.cpp @@ -24,6 +24,7 @@ #include "templatecellsset.h" #include "dimensionwidget.h" #include "qetapp.h" +#include "qeticons.h" #define ROW_OFFSET 2 #define COL_OFFSET 1 #define DEFAULT_PREVIEW_WIDTH 600 @@ -380,15 +381,15 @@ qreal TitleBlockTemplateView::zoomFactor() const { Initialize this view (actions, signals/slots connections, etc.) */ void TitleBlockTemplateView::init() { - add_column_before_ = new QAction(tr("Ajouter une colonne (avant)", "context menu"), this); - add_row_before_ = new QAction(tr("Ajouter une ligne (avant)", "context menu"), this); - add_column_after_ = new QAction(tr("Ajouter une colonne (apr\350s)", "context menu"), this); - add_row_after_ = new QAction(tr("Ajouter une ligne (apr\350s)", "context menu"), this); - edit_column_dim_ = new QAction(tr("Modifier les dimensions de cette colonne", "context menu"), this); - edit_row_dim_ = new QAction(tr("Modifier les dimensions de cette ligne", "context menu"), this); - delete_column_ = new QAction(tr("Supprimer cette colonne", "context menu"), this); - delete_row_ = new QAction(tr("Supprimer cette ligne", "context menu"), this); - change_preview_width_ = new QAction(tr("Modifier la largeur de cet aper\347u", "context menu"), this); + add_column_before_ = new QAction(QET::Icons::EditTableInsertColumnLeft, tr("Ajouter une colonne (avant)", "context menu"), this); + add_row_before_ = new QAction(QET::Icons::EditTableInsertRowAbove, tr("Ajouter une ligne (avant)", "context menu"), this); + add_column_after_ = new QAction(QET::Icons::EditTableInsertColumnRight, tr("Ajouter une colonne (apr\350s)", "context menu"), this); + add_row_after_ = new QAction(QET::Icons::EditTableInsertRowUnder, tr("Ajouter une ligne (apr\350s)", "context menu"), this); + edit_column_dim_ = new QAction( tr("Modifier les dimensions de cette colonne", "context menu"), this); + edit_row_dim_ = new QAction( tr("Modifier les dimensions de cette ligne", "context menu"), this); + delete_column_ = new QAction(QET::Icons::EditTableDeleteColumn, tr("Supprimer cette colonne", "context menu"), this); + delete_row_ = new QAction(QET::Icons::EditTableDeleteRow, tr("Supprimer cette ligne", "context menu"), this); + change_preview_width_ = new QAction( tr("Modifier la largeur de cet aper\347u", "context menu"), this); connect(add_column_before_, SIGNAL(triggered()), this, SLOT(addColumnBefore())); connect(add_row_before_, SIGNAL(triggered()), this, SLOT(addRowBefore()));