From 844d3764c2533417a0487a641ea2bc4ec8c1d475 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 4 Apr 2016 18:03:40 +0300 Subject: [PATCH] Group button. --HG-- branch : feature --- src/app/valentina/mainwindow.cpp | 5 +- src/app/valentina/mainwindow.ui | 54 +++++++++++++++--- .../valentina/share/resources/toolicon.qrc | 2 + .../resources/toolicon/32x32/group_plus.png | Bin 0 -> 1138 bytes .../toolicon/32x32/group_plus@2x.png | Bin 0 -> 2235 bytes .../resources/toolicon/svg/group_plus.svg | 6 ++ src/libs/vmisc/share/resources/icon.qrc | 2 + .../share/resources/icon/16x16/operations.png | Bin 0 -> 448 bytes .../resources/icon/16x16/operations@2x.png | Bin 0 -> 2180 bytes 9 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 src/app/valentina/share/resources/toolicon/32x32/group_plus.png create mode 100644 src/app/valentina/share/resources/toolicon/32x32/group_plus@2x.png create mode 100644 src/app/valentina/share/resources/toolicon/svg/group_plus.svg create mode 100644 src/libs/vmisc/share/resources/icon/16x16/operations.png create mode 100644 src/libs/vmisc/share/resources/icon/16x16/operations@2x.png diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 227ed6aab..08c842102 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -2086,7 +2086,7 @@ void MainWindow::ActionDetails(bool checked) mode = Draw::Modeling; SetEnableTool(true); SetEnableWidgets(true); - ui->toolBox->setCurrentIndex(4); + ui->toolBox->setCurrentIndex(5); if (qApp->patternType() == MeasurementsType::Standard) { @@ -2161,7 +2161,7 @@ void MainWindow::ActionLayout(bool checked) mode = Draw::Layout; SetEnableTool(true); SetEnableWidgets(true); - ui->toolBox->setCurrentIndex(5); + ui->toolBox->setCurrentIndex(6); mouseCoordinate->setText(""); @@ -3042,6 +3042,7 @@ void MainWindow::SetEnableTool(bool enable) ui->toolButtonPointFromArcAndTangent->setEnabled(drawTools); ui->toolButtonArcWithLength->setEnabled(drawTools); ui->toolButtonTrueDarts->setEnabled(drawTools); + ui->toolButtonGroup->setEnabled(drawTools); ui->actionLast_tool->setEnabled(drawTools); diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 90c9bb8a7..fdb501f67 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -48,14 +48,14 @@ Tools - 2 + 4 0 0 - 100 + 130 318 @@ -375,7 +375,7 @@ 0 0 - 100 + 130 58 @@ -700,7 +700,7 @@ 0 0 - 100 + 130 196 @@ -937,12 +937,52 @@ + + + + :/icon/16x16/operations.png:/icon/16x16/operations.png + + + Operations + + + Operations + + + + + + false + + + Create new group + + + ... + + + + :/toolicon/32x32/group_plus.png:/toolicon/32x32/group_plus.png + + + + 32 + 32 + + + + true + + + + + 0 0 - 100 + 130 58 @@ -1028,8 +1068,8 @@ 0 0 - 87 - 58 + 130 + 356 diff --git a/src/app/valentina/share/resources/toolicon.qrc b/src/app/valentina/share/resources/toolicon.qrc index 772aa06a7..8b5d0bec5 100644 --- a/src/app/valentina/share/resources/toolicon.qrc +++ b/src/app/valentina/share/resources/toolicon.qrc @@ -62,5 +62,7 @@ toolicon/32x32/cubic_bezier@2x.png toolicon/32x32/cubic_bezier_path.png toolicon/32x32/cubic_bezier_path@2x.png + toolicon/32x32/group_plus.png + toolicon/32x32/group_plus@2x.png diff --git a/src/app/valentina/share/resources/toolicon/32x32/group_plus.png b/src/app/valentina/share/resources/toolicon/32x32/group_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..4b00755f062d4523700904b53550720ad9898ef5 GIT binary patch literal 1138 zcmV-&1daQNP)qO-oH@dMhT}LoZM&{3X)MI{?1qH1B(Q7b#-N?rl$IUcY#bTUJE&-PN1{1bJN`1+#t}F zihEjX5s?DW@4D`(RP2;(+ae+Z6^Dp?) z+jju{skNsoYLYmPUs;MgDPpJA`dF3wE#PBd2XL&ty?v*llsW^LNy61I z4Ew4U1;B3LnBzE@rujKQxm4q#cG~ z3;@q0=3Ep-J((Z~{U~i4&XI$4k4tG0ib93_m zaH0~_T7T(zUN5A&T~kxjxApb)PXO7(wQq8AGG|$q9|XZn5Cp@PWlbg`9$bd_25`i6 z-46i@g~GP^`T4IzL^Nz_Tg$Jn)H#oGq0~*Yo-O zM$gwvchK7bJ@7&^vXoa6q1YFiy zdrGOFq9_`hnVGo>uzB<5txBnfwbqX-rJO`u_1a=Cmm8?=j?0c@wr%efkq>~}ayhj? zYkeh?$-F&0JpAKQ@l|I++qMsg$RX}tOWkVu3GQgEzfnq^FO^EeD<#%El;-pKEv9L9 zCX>-qz*b;O621l81V%;VO1WJA&iDOWweG!+b^O2a5BmRldF3s8O8@`>07*qoM6N<$ Eg7pg@rvLx| literal 0 HcmV?d00001 diff --git a/src/app/valentina/share/resources/toolicon/32x32/group_plus@2x.png b/src/app/valentina/share/resources/toolicon/32x32/group_plus@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7b9c63a74f37de0d0e3615927895bc7005b06e28 GIT binary patch literal 2235 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 JPDHLkV1h4TLP-Ds literal 0 HcmV?d00001 diff --git a/src/app/valentina/share/resources/toolicon/svg/group_plus.svg b/src/app/valentina/share/resources/toolicon/svg/group_plus.svg new file mode 100644 index 000000000..92243882d --- /dev/null +++ b/src/app/valentina/share/resources/toolicon/svg/group_plus.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/libs/vmisc/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc index ed0dec1b4..3d273e73d 100644 --- a/src/libs/vmisc/share/resources/icon.qrc +++ b/src/libs/vmisc/share/resources/icon.qrc @@ -55,5 +55,7 @@ icon/16x16/toolsectioncurve@2x.png icon/16x16/toolsectionline@2x.png icon/16x16/toolsectionpoint@2x.png + icon/16x16/operations.png + icon/16x16/operations@2x.png diff --git a/src/libs/vmisc/share/resources/icon/16x16/operations.png b/src/libs/vmisc/share/resources/icon/16x16/operations.png new file mode 100644 index 0000000000000000000000000000000000000000..76e5e17fe34f0e7e703d49c6e23c0aec1d18c7ee GIT binary patch literal 448 zcmV;x0YCnUP)rQ{Av5#Ye+FS*3>Wk;9Ltnr z`0NQ{KVsnBE;Cbi)01>5Oc(t9`3tL!62IPhhJ=JLfG~(1z|Xf# z^((_Kpd2!ei;Dw^XLfdWPJ2MeP`}3QD_28*Z|3Y{-gJ>8VC&YTZ-WdV1_uNL{0GJW7=zd_aTa28 q9WYHy4+;v(MD{;HFAxI&0t^8DANvn?@D3yZ0000*TXw)<$jn;@ZBCSRtD!oAI4A2=Y19Lqy=YICO{CqfPh8CF8dRfWN zIr*($_WJJcZ+*YNA6rkB760e8^<-IXJz2izo&wnVYB>jNLFiMUfl}5p1<=rp0sWo) z<R~(df&hx-`JNc)b;vgHu)$RBmpowq> zI1GGn9{|z^JR$IqR|-+|S2TkPRN^Tr7--|9SPduw+$%01S)pGELrMhI{-BpXt2`lq zc+u^5LNnl%YM|b1D2jm)<`ky_;VghtEY%ew0QZVJh0O}D7Oc!CUY^lyHuZf0AX4hk z-e1w`&3dS=;HBR~u&S9taj{dXj1uyKVpZ!8QMv_M5F$hhD8gFEhsGH{j4f(mMM3Gl z0181ga|xL6Hq?=D9kr{ul>Y(6&zJfCX6~E zYqcb~`pr)ppWLki@0WqoqIA(KwS@B-kh|rh6euKcX{b%JCsYOcdV9$g3IGfZD@I0! zb7eD!ua+4|%etV_hyV22PbSqj#G-w8-qo^^8FLlZ-4Lg*M6D1vjwa( zP`WyegaOS>MSN031<^g|U#kK*=fzkn##*ek9TGiCX>$2In;(3D()>-b((I|!8{b;3 zRPAb|S~`04=s)-G-(Nd$;D7)eK76?2QUkqXs<-QfxMg3+R2yRwM>WyfZcqZecNk-^ z#^Bs-0LB=sb7bO}9gpo~{Hu@Uf-oAdR4RLnF+U7~V9$vYC-R?sV_OACKf-s#`vGO` zS)%YF)&=-GRnRGcYaeEe!8wQb9_Jj+Ik1*64C(3ZmDCtDGBOfbYsYG}nk|>hl*{F% zBS(&0@ZL8L9XjMYDzF`=6~z1Ymu}R&b(?{-1Hf9lez+6fo zpFjWT>gsBk&1NN=%?<@Y@D{MR<^#*1P74%$7%X922Dyg{P-}MplcuC5#aee4fVJN! ziWnIgkuVI^($Z2C1i`jSr9!P%vm)}|I)K=?DGBw#MsHWq^%O=_vz4b~#dk5F+6Sa* zib>mdz&W?hgzB&-A_PGIpausA*}HcylarI-nKNg`7Zw(loO37ERj@k!F+>qQj>QiT zTB6WlY@2~VTeSA=|Dh*9S?_gf45>*m#vmd@QH0hSV@yX8idwBksZ>I1O*WfdXK4-W zIsiR9IELbRRjv0+x%#Smq~{8^n*GYUK(dJ;)+uYQ#&={jknv$mNtwN!I_nzhD zWvsQtam>QP0_V@4m$|t)6-5!wIlHp5G6|g5T32p6p`s7igR?_=c79%*L;8BID{Djj zubX4a*Z}|==jYk7`Te-LGH;u8Yh5pKoFF1xzkVI(9Qk~nT(0dol}d#xSFWh5SFidc zNgA0<=1LSrXQC*2TWh^?yBCP}KojFprPXJ`a%IT(bw7uobgBGP#P0>rI{dw_4!pf> z`giZRx^0RYrC2Ott>uk3-oQD>lTSX$(9n=nt5ubzDXmtEG)*f}6kPz`^4|YClgV6) zvj`xC+yY810VwecT(t|kF8)08kB6SRQExQAHa#8)00MB52wZqOixb_UcP*p<>lqSHyVwP zXJ%&lXJ==#g+hVB!9j+Hhso#j@!Z_p=;Gp{F~RNX+iP9@5&U)`JSZljQB+X{Cv$a}nxA*=BnM{U(fdLAIf&g@P zcOxRSS}lw*pPq=)qkBL1!B0Q^G=Mt!%JCFf=sfG|@y8#(md$3br)m0?nVA`qBvAm@ zu3e+iXyBZ?>Ag?y9!S0*0UK@Pa=B&@1nKbO zW4fGkna-?`W-^(IQmWj^`QNUIi3uhqCe#