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

src/board/UBBoardView.cpp

@@ -426,6 +426,7 @@ UBBoardView::mousePressEvent (QMouseEvent *event)
 
             if (!movingItem 
                 || movingItem->isSelected()
+                || movingItem->data(UBGraphicsItemData::ItemLocked).toBool()
                 || movingItem->type() == UBGraphicsDelegateFrame::Type
                 || movingItem->type() == DelegateButton::Type 
                 || movingItem->type() == UBGraphicsCompass::Type

src/domain/UBGraphicsVideoItem.cpp

@@ -120,6 +120,9 @@ void UBGraphicsVideoItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 
 void UBGraphicsVideoItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
+    if (mDelegate->delegated()->data(UBGraphicsItemData::ItemLocked).toBool())
+        return;
+
     if(mShouldMove && (event->buttons() & Qt::LeftButton))
     {
         QPointF offset = event->scenePos() - mMousePressPos;