From 15b4c680164f9be3ba94dfb6680136c1fd26fb5a Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 16 Aug 2012 09:13:44 +0200 Subject: [PATCH] fixed issue 937 --- resources/images/toolbar/group.png | Bin 2000 -> 1215 bytes resources/images/toolbar/ungroup.png | Bin 2268 -> 1496 bytes src/board/UBBoardController.cpp | 4 +++- src/core/UBSettings.cpp | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/images/toolbar/group.png b/resources/images/toolbar/group.png index 95dbf738554383886841f8e912e74f0d10019a3e..bccfa0b75fe206f536924770f47b87568f36a2d1 100644 GIT binary patch delta 1208 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 Tk09S^eq&>Waf0)_ody2^|4<_# diff --git a/resources/images/toolbar/ungroup.png b/resources/images/toolbar/ungroup.png index 48f229a970ee6d59acee03157eccf23a7eb132eb..2a7b64b51baea71490043484919c2fc3559134b4 100644 GIT binary patch delta 1491 zcmV;^1uXj95!efm7k?lK1^@s6b9#F800001b5ch_0Itp)=>Px#24YJ`L;(K){{a7> zy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyn{20IE7s}Mc_00me{L_t(o z!|j(}Y*fb;#(%SW*LE=2%PuyyA+b$DsDeVU72-a$K~yOrQh(JbLOe!_tUU07B85IQ zFXTBAMe1`^p}rK5c&VzYQmUq@)T(OJ0*x_&VDOS%uy?VStoP5ocjnHVKJ0o~{NLrV zJ<@3Aj_#fFo$otyW-k1%n_4_(=tVU#m zE=91;Qmz(xw)a5nmG8Xyjxpv}Ykjf|Kp2Kp{YRAi+YG*l^ z4=GO@o{clm(R-sawC8l$9CW_dwwt4^} z>_{4-YKBUwpu#XDrnN>yu-4(6;Nq=dQbz9Ut>B2BXsed@V zgCk5#dF#qIdAFT`7ru)~z39clFhoQ!k!?t@fo3ftbp{p#*gN`TZsc|{dAEJl=qIK+ zxIMd@JqM084=OJVL#(qDOJzE>-PonWMokG80VLYDGWOPoT>H~6DObOyZ-*t_Z4rU_ zQk(~K9uLF)96I(M@x(J&YwO!E41YrsamDT(3GV*=)25TI-raN$JWo8)20-!NP0EG) zpkR1lD_$J5)@ZHk$2ZWiHO<(Me!{&QpEH@iL+R!>D5dC550c)skJt8nuaU&A8GyIA zz`MuxJQ3yRS7x}9n3YXgJBYik`pDVdr&CFj4Ael@)$mjDj7cN}*%X*HN%vFss#xusOx%Ur` z4j^(L2Ktx1*OCJo(ErWl%}g`Kl%}VrKOGtxI=U8!r5a|l+0X9Wxl>qJSTIlZYu47* t*4?;3CD+ny1uDzHRp0j?@qc>?`w#Ff*`;2CNk{+y002ovPDHLkV1iR}-?9Jz literal 2268 zcmaJ@X;>3k7A**%$Rg5>BEoctAgCd!$^s@30TY&>L5M*RMGT=J!6X%vK*G|3E8qen zZsRDliY!W#0mLx0pbd%$qvF!-4A?-^D1r)TPY{rZT~V>;hfaN8y?XC{=bU@)yZ1-s zhJ^-M&2g9m0Du)cn8iiESoC$AZHBHub0ZF27b*jylG=qLfjbHFNfg8Pi6^9kY zGjNeq4#<%)VWB8EO%AV13*`yYwhCzRINz06A2l5nkibelRxJ@r6?8QN_g2VLd4Xhyv0mG(46BLLd<$5kW5x2&7ZJ=pcms z_~6iN^7sTgmlgOi7kXmggi581P9&;SDuRkkK;(%;h(@CkK@yQf@<0(Did3nRulA5C z7SAZKV1+;~k|{-q6l+lA$05l|1`c)lp#+KSldM$n@tV*JBdYl_B18ZUCCvaioc|A% zNIszzN-q4T-_Hswc&Rd&$b}V1vRr^RE@81Dm5k1m!+a$o=OKuA<`%<*h!Rl<5gC@b zj!J;A9KJv#HALPsI2<}#s!;N!0+`KW;7|>MNEAWzR~ou9sZ65W*|rB}I(Q<*woyo3pE&s|DUvt!lWtu=~ow*8R^X+;-$H zAz$t}G1)WTI6lDEN{XureKWUTbYZ6py8?@^_f}fR;ZGfRuo&<>$aioH3<`=kA_{qB z5%cf4MU3>^9}shj>@+ zW#5VmF75wM&kvD3`_nC8Zn)O@xkar_rlTL# z>~R4gbar{}s_#g#|8+_dWqb#4Nlz|r*O9O7;fcwX!;|YzoHOwlYS!z08a9vKy?OJd zL*yBogZC#?Y;$>i)BNHXR}wIQPajj(aae~Hb{-XmdT<@mKDUwu!dG|MdroL(Ip+Z*Oyo1+VH!sWYbB&xPuF;a_z9-=ek$OD@~t1js$JmZ=!3q|{i z+Y0yIw)9EI_2qkC5{@oh75T2($AUyFKWDS=?U6}>?ODN|S&q$%>^x#art^kg+8b@j z<29Wh4M*0-Ri)1(?Z4Oe_bpYGo13i>tI{^Nk=;+L-VM@TG4gG!PmBIFfApkR>$>1` z_Ll3TRcvvk@bDjSP#X64E}&1>xUYj(@coe0e<>bf}f{Izul zV%@g;4f1`vez2ZhZx^~t8ZDR6FtI8kzPM&Y{_sZgb(0!8GoxpJ;^SfQH%#Hc0!x!) zKi1C1lOt+p-DbO;^n0PJaA~a*c0z+dR*QRP8O41WGqA2=fH4yF%d?)m!@<yw(!b1j$sD?`C!o1Zke?xX_$2})9u?$i;Ma##t$9v znYZx#qh6rJwcYDp%NVCp)0BNi6<7r(TO97&;4W(eZA1sHGO*W&Diq?ltS*D zrFdz!`EHouyrk5rgJ|~aD|HcfvQhn{{pfcUPMdTDPU0dx>4N=Kkl9c25P zvvN!~PYe;c4cma+`uh4sF)=Z%%Xhdx1nn(*P8Aj&bg?z>cik5hOr=t9SC}3tD@brH me?0caDIy|rv)PZC#+HEJzAmXAgV!1UH`oE8EX}GdJO2PqD5`Y; diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index b631f694..fda76415 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -880,11 +880,13 @@ void UBBoardController::groupButtonClicked() } if (groupAction->text() == UBSettings::settings()->actionGroupText) { //The only way to get information from item, considering using smth else - UBGraphicsGroupContainerItem *groupItem = activeScene()->createGroup(selItems); + groupAction->setIcon(QIcon(":images/toolbar/ungroup.png")); + UBGraphicsGroupContainerItem *groupItem = activeScene()->createGroup(selItems); groupItem->setSelected(true); UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); } else if (groupAction->text() == UBSettings::settings()->actionUngroupText) { + groupAction->setIcon(QIcon(":images/toolbar/group.png")); //Considering one selected item and it's a group if (selItems.count() > 1) { qDebug() << "can't make sense of ungrouping more then one item. Grouping action should be performed for that purpose"; diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index fc622af8..ea2ec01f 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -399,8 +399,8 @@ void UBSettings::init() libIconSize = new UBSetting(this, "Library", "LibIconSize", defaultLibraryIconSize); - actionGroupText = "Group items"; - actionUngroupText = "Ungroup items"; + actionGroupText = "Group"; + actionUngroupText = "Ungroup"; }