Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop

src/board/UBBoardView.cpp

@@ -528,6 +528,8 @@ Here we determines cases when items should to get mouse press event at pressing
         return true;
 
     case DelegateButton::Type:
+        return true;
+
     case UBGraphicsMediaItem::Type:
         return false;
 
@@ -1123,6 +1125,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
           else
           {
              if (isUBItem(movingItem) &&
+                DelegateButton::Type != movingItem->type() &&
                 QGraphicsSvgItem::Type !=  movingItem->type() &&
                 UBGraphicsDelegateFrame::Type !=  movingItem->type() &&
                 UBToolWidget::Type != movingItem->type() &&

src/domain/UBGraphicsGroupContainerItem.cpp

@@ -79,6 +79,8 @@ void UBGraphicsGroupContainerItem::addToGroup(QGraphicsItem *item)
     item->setPos(mapFromItem(item, 0, 0));
 
     item->scene()->removeItem(item);
+    if (corescene())
+        corescene()->removeItemFromDeletion(item);
     item->setParentItem(this);
 
     // removing position from translation component of the new transform
@@ -225,6 +227,18 @@ void UBGraphicsGroupContainerItem::destroy() {
     remove();
 }
 
+void UBGraphicsGroupContainerItem::clearSource()
+{
+    foreach(QGraphicsItem *child, childItems())
+    {
+        UBGraphicsItem *item = dynamic_cast<UBGraphicsItem *>(child);
+        if (item)
+        {
+            item->clearSource();
+        }
+    }
+}
+
 void UBGraphicsGroupContainerItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (mDelegate->mousePressEvent(event)) {

src/domain/UBGraphicsGroupContainerItem.h

@@ -39,6 +39,8 @@ public:
     virtual void setUuid(const QUuid &pUuid);
     void destroy();
 
+    virtual void clearSource();
+
 protected:
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);

src/domain/UBGraphicsScene.cpp

@@ -1375,7 +1375,7 @@ UBGraphicsGroupContainerItem *UBGraphicsScene::createGroup(QList<QGraphicsItem *
             }
             foreach (QGraphicsItem *chItem, childItems) {
                 groupItem->addToGroup(chItem);
-                mFastAccessItems.removeAll(item);
+                mFastAccessItems.removeAll(chItem);
             }
         } else {
             groupItem->addToGroup(item);

src/frameworks/UBCoreGraphicsScene.cpp

@@ -53,6 +53,8 @@ UBCoreGraphicsScene::~UBCoreGraphicsScene()
 
 void UBCoreGraphicsScene::addItem(QGraphicsItem* item)
 {
+    addItemToDeletion(item);
+
     if (item->type() == UBGraphicsGroupContainerItem::Type && item->childItems().count()) {
         foreach (QGraphicsItem *curItem, item->childItems()) {
             removeItemFromDeletion(curItem);
@@ -80,17 +82,7 @@ bool UBCoreGraphicsScene::deleteItem(QGraphicsItem* item)
 {
     if(mItemsToDelete.contains(item))
     {
-        UBGraphicsItem* item_casted = 0;
+        UBGraphicsItem *item_casted = dynamic_cast<UBGraphicsItem *>(item);
-        switch (item->type())
-        {
-        case UBGraphicsMediaItem::Type:
-                item_casted = dynamic_cast<UBGraphicsMediaItem*>(item);
-                break;
-        case UBGraphicsW3CWidgetItem::Type:
-                item_casted = dynamic_cast<UBGraphicsWidgetItem*>(item);
-                break;
-        }
-
         if (0 != item_casted)
             item_casted->clearSource();