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

@@ -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>

resources/images/z_layer_down.svg

+<?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>

resources/images/z_layer_up.svg

+<?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>

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>

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);

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;

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);

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;