From 27f18d0b77b04d38df97dcf58ddcaab8fe053926 Mon Sep 17 00:00:00 2001
From: Aleksei Kanash <sc.kanash.aleksei@gmail.com>
Date: Wed, 18 Jul 2012 18:14:12 +0300
Subject: [PATCH] SANKORE-742 - new icons for group/ungroup action, play tool
 and z-layer buttons used.

Fixed a bug - grouped items cannot be dragged by itself now.
---
 resources/forms/mainWindow.ui                 |   3 ++-
 resources/images/cursors/play.png             | Bin 0 -> 3202 bytes
 resources/images/stylusPalette/handPlay.png   | Bin 444 -> 3006 bytes
 resources/images/stylusPalette/handPlayOn.png | Bin 603 -> 3356 bytes
 resources/images/toolbar/group.png            | Bin 0 -> 2000 bytes
 resources/images/toolbar/ungroup.png          | Bin 0 -> 2268 bytes
 resources/images/z_layer_down.svg             |  17 +++++++++++++++++
 resources/images/z_layer_up.svg               |  17 +++++++++++++++++
 resources/sankore.qrc                         |   5 +++++
 src/board/UBBoardView.cpp                     |  12 ++++++++++--
 src/domain/UBGraphicsItemDelegate.cpp         |   4 ++--
 src/gui/UBResources.cpp                       |   1 +
 src/gui/UBResources.h                         |   1 +
 13 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 resources/images/cursors/play.png
 create mode 100644 resources/images/toolbar/group.png
 create mode 100644 resources/images/toolbar/ungroup.png
 create mode 100644 resources/images/z_layer_down.svg
 create mode 100644 resources/images/z_layer_up.svg

diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui
index 0582f8da..0ce11f87 100644
--- a/resources/forms/mainWindow.ui
+++ b/resources/forms/mainWindow.ui
@@ -1637,7 +1637,8 @@
    </property>
    <property name="icon">
     <iconset resource="../sankore.qrc">
-     <normaloff>:/images/toolbar/library.png</normaloff>:/images/toolbar/library.png</iconset>
+     <normaloff>:/images/toolbar/group.png</normaloff>
+     <normalon>:/images/toolbar/ungroup.png</normalon>:/images/toolbar/group.png</iconset>
    </property>
    <property name="text">
     <string>Group Items</string>
diff --git a/resources/images/cursors/play.png b/resources/images/cursors/play.png
new file mode 100644
index 0000000000000000000000000000000000000000..25030dd13fcd5471b951d04e5904ac55256a8d07
GIT binary patch
literal 3202
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

literal 0
HcmV?d00001

diff --git a/resources/images/stylusPalette/handPlay.png b/resources/images/stylusPalette/handPlay.png
index 999f7703d66dae1639681e63fc28e21af797d040..186c81da56a5fa276b3cc02ee1fd4f473d8fa84e 100644
GIT binary patch
literal 3006
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

literal 444
zcmeAS@N?(olHy`uVBq!ia0vp^3Lq@N1|*eVE!z&H*pj^6UH*dsXT<kAKoQOYkH}&m
z?E%JaC$sH<j9;EEjv*QM-cCQwcSM21_2`d>|0>giAM^CGh6EVT@eK}I{QXl0@4-Tu
z<AwjkHr#!;Yf8$2XKXR%QkNK4)$A0UsIT~Z&QhT#hw51`ehf?sSZMz^RaVUBXmzyC
zJEfYbf|=6_VpiSgxF>Y1>9n<eoZp3emS4aA_-tLX;5*OBbjR$y*9t`W4hpUJ_jzso
z>L&MgQMI!Tv$XS;6`Twz)D1FNW_l#d@FqipQOydTSzq-^le%lx3;c>pj4yXTeQ3LZ
z)3vB)u^C_eH~4bDkT$gP5kH@}k9Bk2wC?Bw=M21lsEH=z9x;CS(TDk1t9%^e9WRTu
zN85XEJj{D(an7@b;oj5K0!!BFFThYxEpd$~Nl7e8wMs5Z1yT$~28M>Z24=cO1|f#V
uRwf2k21eQjMpgy}o!0HnC>nC}Q!>*kaclUIX8#|kfx*+&&t;ucLK6TUUan#Q

diff --git a/resources/images/stylusPalette/handPlayOn.png b/resources/images/stylusPalette/handPlayOn.png
index 9191cffa6fd56a93b1671b4b0522e0cec721baf2..5b86d97e35044c56a2b87a907909f9d54e4e7189 100644
GIT binary patch
literal 3356
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

literal 603
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5kS)pE-Q_<Ra7KK;0~Ap$ag8WRNi0dVN-jzT
zQVd20hK9NZX1YcOA%@0QCI(gpM%o5ORt5&0*6q$H8glbfGSez?Yxt37{~zec8c!F;
zkO=p);f#|GD{!o-t^D<A%M-rcjs*wJ%%A(DT~Szby36x+{M)dMwOdz~Uc9?Dl_4QO
zY(bK?^+JXtiri9xlOm;=F3erS79Mb>pIf1MkHYN3CZ8&|_pRg5Gi>qnKcLPK&U)Rq
zO2JR_1XF^$VB}V*O@>wtULU#)Z1-D~FG(<{vWe+E>!76Fqj=|l!lA3iy+3<@y@+;P
z#*lJ3m{qai-I<+ATSZRasNSS-#V>DK?fq?yKiP`E{cuq_lf!o1Y3dYh&Rg5QHZojs
zS1&yGt#|q556k8D&hA;sCSs^`+;V-q=4BCwCu^QhsF61?&}0adonBcRvEW0+|7WUO
z=XLg2Zj{$H@-sBp?Gq7Do4-0)-$ih*&i9)KqFyQg7Gl=+*--s(2XA<>wB_~1C!6Ho
za5H>&TT_se6PaKbKEakXRQJpW*QHXyEB>nT);OHo@P*}pe#C}1JUlU+hrD}dH|1Zg
zd}4j+=>NZ_o3k4G+gGyX?oDr6%H!gYwsaQj(eM7!9<@8IZw2K7BaXq-)z4*}Q$iB}
D2Ttn+

diff --git a/resources/images/toolbar/group.png b/resources/images/toolbar/group.png
new file mode 100644
index 0000000000000000000000000000000000000000..95dbf738554383886841f8e912e74f0d10019a3e
GIT binary patch
literal 2000
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
Tk09S^eq&>Waf0)_ody2^|4<_#

literal 0
HcmV?d00001

diff --git a/resources/images/toolbar/ungroup.png b/resources/images/toolbar/ungroup.png
new file mode 100644
index 0000000000000000000000000000000000000000..48f229a970ee6d59acee03157eccf23a7eb132eb
GIT binary patch
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*jyl<SZLrHU_y0snX;4#u)2{6v@w
z^W#&uwZT3BfN>G=qLfjbHFN<YA@B_tf?6UohyXsmY8hX!6;@*7;6#y>fg8Pi6^9kY
zGjNeq4#<%)VWB8EO%AV13*`yYwhCzRINz06A2l5nkibelRxJ@r6?8QN_g<Hd?hRog
z4*MRW+{(axFcrlK!!i*$jHMDl4*}>2VLd4Xhyv0mG(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|>MNEA<JQK_B*AVg+TC@csHfN1_u02(8&
z00T%~tN_*wmxTzDC9qUE!;SxwOZg(#FbonInwbU5MJaH6pd684-xp06eZ~uuwhDr%
zG=EeN`n;D9-1skhA$`#c5j8_JwDx~mJrhFb$FTi0xai^2=)+QU-sR|EH;QqC0AL!*
zX8H5fUFX(w#9sw{J)P1RYCK8yoFp5$?bv-`o^NiJ?(WWVchmDpd&2U9?S5<C6B1$l
zWL3w};F6+>WzR~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><yYlk##s|Z1?DtykXr1}(*t4HIgwqcK0d;hAM%l=njO<#6>^9}shj>@+
zW#5VmF75wM&kvD3<L!^iEU!(}+%KR4HJ$kTU2|-^n96VNZi!kdz4hj{mcu%Bc6N_~
zKRVL?3s!6o2$t-~VN(0=ZYVgZg?@M4kfp`1eo^NPoLIB>`_nC8Zn)O@xkar_rlTL#
z>~R4gbar{}s_#g#|8+_dWqb#4Nlz|r*O9O7;fcwX!;|YzoHOwlYS!z08a9vKy?OJd
zL*yBogZC#?Y;$>i)BNHXR}<Slx{hL1{2<eW>wIQPajj(aae~Hb{-XmdT<@mKDUw<j
zjOTGbVQisM%;74@6u&5C_ejISPD)Y0)6*qqYZovjjSDtLr}t^L%KkP!nSq4oY}ai1
zr>u!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_Ll3TRcvv<oukmu)m(Dx+_;R9<>k@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!@<<jzlPxb
zA2Q2TtxYvashFJ3%D-R|(uy9kT&%Oacb+~46|J~=^u^P@NX^D$OK((HSFa_;UeU9c
zyd^&Iu+we`POmpH{iy)6b;vF^y8&mL59e|eg0Tjql4LX6WcomB{|0snGlFUiYnHD~
zU?&8ezxK`u)M~CT2Ec*GsaM(t22${Zlc1Fop}won_I_ueI4SAUL^N$Kwrsha#2YSE
zJa|Q56Kc)OK&Y5^6!|^eLw|YmSJb^PjSfu?wt<}&Or8(!taQYrV$x>yw(!b1j$s<k
zt)Ke(xNd2$i)4gl&PM-;`z_byS+e%Z*<B~{Oj3c7E;GwQy-mOGc7MBjm|6sWNhR||
z_`c=`<vX8<eXWbs-_;B*k*6KAU`}@o7u>D?`C!o1Zke?xX_$2})9u?$i;Ma##t$9v
znYZx#qh6rJwcYDp%NVCp)0BNi6<7r(TO97&;4<Pn-!$nW5$M%+uc)0Gi*VCAVvgv|
z5<_+Rj`odp3$}SvFdbUQoa^_ESFZF5Qx`umDzA<b7ihYtGagzrr15mNb*IVsfyLt!
z(XOMImf@Rz-n4;rdb<oiYzmEbwJO}<DQ{ZwMmLndH#>W(eZA1sHGO*W&Diq?ltS*D
zrFdz!`EHouyrk5rgJ|~aD|HcfvQhn{{pfcUPMdTDPU0dx>4N=Kkl9<Ew`g=U>c25P
zvvN!~PYe;c4cma+`uh4sF)=Z%%Xhdx1nn(*P8Aj&bg?z>cik5hOr=t9SC}3tD@brH
me?0caDIy|rv)PZC#+HEJzAmXAgV!1UH`oE8EX}GdJO2PqD5`Y;

literal 0
HcmV?d00001

diff --git a/resources/images/z_layer_down.svg b/resources/images/z_layer_down.svg
new file mode 100644
index 00000000..02908437
--- /dev/null
+++ b/resources/images/z_layer_down.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.2" baseProfile="tiny"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="27px" height="27px" viewBox="0 0 27 27" overflow="visible" xml:space="preserve">
+<defs>
+</defs>
+<circle fill="#939393" stroke="#CECCCC" stroke-width="2" stroke-miterlimit="10" cx="13.5" cy="13.5" r="12.5"/>
+<rect x="6" y="8" fill="#FFFFFF" width="11" height="2"/>
+<rect x="6" y="12" fill="#FFFFFF" width="11" height="2"/>
+<rect x="6" y="16" fill="#FFFFFF" width="11" height="2"/>
+<rect x="13" y="6" fill="#EFA725" width="6" height="8"/>
+<polygon fill="#EFA725" points="16,21 16,21 22,14 10,14 "/>
+</svg>
diff --git a/resources/images/z_layer_up.svg b/resources/images/z_layer_up.svg
new file mode 100644
index 00000000..746b6c9a
--- /dev/null
+++ b/resources/images/z_layer_up.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.2" baseProfile="tiny"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="27px" height="27px" viewBox="0 0 27 27" overflow="visible" xml:space="preserve">
+<defs>
+</defs>
+<circle fill="#939393" stroke="#CECCCC" stroke-width="2" stroke-miterlimit="10" cx="13.5" cy="13.5" r="12.5"/>
+<rect x="6" y="8" fill="#FFFFFF" width="11" height="2"/>
+<rect x="6" y="12" fill="#FFFFFF" width="11" height="2"/>
+<rect x="6" y="16" fill="#FFFFFF" width="11" height="2"/>
+<rect x="14" y="13" fill="#EFA725" width="6" height="8"/>
+<polygon fill="#EFA725" points="17,6 17,6 11,13 23,13 "/>
+</svg>
diff --git a/resources/sankore.qrc b/resources/sankore.qrc
index d07c048f..d9263dbd 100644
--- a/resources/sankore.qrc
+++ b/resources/sankore.qrc
@@ -42,6 +42,8 @@
         <file>images/currentDocument.png</file>
         <file>images/minus.svg</file>
         <file>images/plus.svg</file>
+        <file>images/z_layer_up.svg</file>
+        <file>images/z_layer_down.svg</file>
         <file>images/trash.png</file>
         <file>images/pin.svg</file>
         <file>images/unpin.svg</file>
@@ -49,6 +51,8 @@
         <file>images/reload.svg</file>
         <file>images/frozen.svg</file>
         <file>images/unfrozen.svg</file>
+        <file>images/toolbar/group.png</file>
+        <file>images/toolbar/ungroup.png</file>
         <file>images/toolbar/window.png</file>
         <file>images/toolbar/plusBlack.png</file>
         <file>images/toolbar/plusBlackOn.png</file>
@@ -183,6 +187,7 @@
         <file>images/cursors/resize.png</file>
         <file>images/cursors/drawCompass.png</file>
         <file>images/cursors/drawRulerLine.png</file>
+        <file>images/cursors/play.png</file>
         <file>images/print/onepage.png</file>
         <file>images/print/thumbnails.png</file>
         <file>images/print/twopages.png</file>
diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 1e347acc..c3a47261 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -637,6 +637,12 @@ void UBBoardView::rubberItems()
 {
     if (mUBRubberBand)
         mRubberedItems = items(mUBRubberBand->geometry());
+
+    foreach(QGraphicsItem *item, mRubberedItems)
+    {
+        if (item->parentItem() && UBGraphicsGroupContainerItem::Type == item->parentItem()->type())
+            mRubberedItems.removeOne(item);
+    }
 }
 
 void UBBoardView::moveRubberedItems(QPointF movingVector)
@@ -945,7 +951,9 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
           }
           else
           {
-              movingItem->setSelected(true);              
+             if (   QGraphicsSvgItem::Type !=  movingItem->type()
+                 && UBGraphicsDelegateFrame::Type !=  movingItem->type())
+                 movingItem->setSelected(true);
           }
       }
 
@@ -1360,7 +1368,7 @@ UBBoardView::setToolCursor (int tool)
       controlViewport->setCursor (UBResources::resources ()->arrowCursor);
       break;
     case UBStylusTool::Play:
-      controlViewport->setCursor (UBResources::resources ()->drawLineRulerCursor);
+      controlViewport->setCursor (UBResources::resources ()->playCursor);
       break;
     case UBStylusTool::Line:
       controlViewport->setCursor (UBResources::resources ()->penCursor);
diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp
index d48c30dc..e4a7f747 100644
--- a/src/domain/UBGraphicsItemDelegate.cpp
+++ b/src/domain/UBGraphicsItemDelegate.cpp
@@ -137,12 +137,12 @@ void UBGraphicsItemDelegate::init()
     connect(mMenuButton, SIGNAL(clicked()), this, SLOT(showMenu()));
     mButtons << mMenuButton;
 
-    mZOrderUpButton = new DelegateButton(":/images/plus.svg", mDelegated, mFrame, Qt::BottomLeftSection);
+    mZOrderUpButton = new DelegateButton(":/images/z_layer_up.svg", mDelegated, mFrame, Qt::BottomLeftSection);
     connect(mZOrderUpButton, SIGNAL(clicked()), this, SLOT(increaseZLevelUp()));
     connect(mZOrderUpButton, SIGNAL(longClicked()), this, SLOT(increaseZlevelTop()));
     mButtons << mZOrderUpButton;
 
-    mZOrderDownButton = new DelegateButton(":/images/minus.svg", mDelegated, mFrame, Qt::BottomLeftSection);
+    mZOrderDownButton = new DelegateButton(":/images/z_layer_down.svg", mDelegated, mFrame, Qt::BottomLeftSection);
     connect(mZOrderDownButton, SIGNAL(clicked()), this, SLOT(increaseZLevelDown()));
     connect(mZOrderDownButton, SIGNAL(longClicked()), this, SLOT(increaseZlevelBottom()));
     mButtons << mZOrderDownButton;
diff --git a/src/gui/UBResources.cpp b/src/gui/UBResources.cpp
index 0bcad20d..191480f0 100644
--- a/src/gui/UBResources.cpp
+++ b/src/gui/UBResources.cpp
@@ -60,6 +60,7 @@ void UBResources::init()
     zoomInCursor    = QCursor(QPixmap(":/images/cursors/zoomIn.png"), 9, 9);
     zoomOutCursor   = QCursor(QPixmap(":/images/cursors/zoomOut.png"), 9, 9);
     arrowCursor     = QCursor(Qt::ArrowCursor);
+    playCursor      = QCursor(QPixmap(":/images/cursors/play.png"), 6, 1);
     textCursor      = QCursor(Qt::ArrowCursor);
     rotateCursor    = QCursor(QPixmap(":/images/cursors/rotate.png"), 16, 16);
     drawLineRulerCursor = QCursor(QPixmap(":/images/cursors/drawRulerLine.png"), 3, 12);
diff --git a/src/gui/UBResources.h b/src/gui/UBResources.h
index fcba66e3..66a61880 100644
--- a/src/gui/UBResources.h
+++ b/src/gui/UBResources.h
@@ -47,6 +47,7 @@ class UBResources : public QObject
          QCursor zoomInCursor;
          QCursor zoomOutCursor;
          QCursor arrowCursor;
+         QCursor playCursor;
          QCursor textCursor;
          QCursor rotateCursor;
 		 QCursor drawLineRulerCursor;