diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 901f2cb5..48cc5932 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -555,6 +555,8 @@ Here we determines cases when items should to get mouse press event at pressing return true; case UBGraphicsMediaItem::Type: + case UBGraphicsVideoItem::Type: + case UBGraphicsAudioItem::Type: return false; case UBGraphicsTextItem::Type: @@ -626,6 +628,8 @@ bool UBBoardView::itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item) case DelegateButton::Type: case UBGraphicsMediaItem::Type: + case UBGraphicsVideoItem::Type: + case UBGraphicsAudioItem::Type: return true; } @@ -858,6 +862,8 @@ void UBBoardView::moveRubberedItems(QPointF movingVector) if (item->type() == UBGraphicsW3CWidgetItem::Type || item->type() == UBGraphicsPixmapItem::Type || item->type() == UBGraphicsMediaItem::Type + || item->type() == UBGraphicsVideoItem::Type + || item->type() == UBGraphicsAudioItem::Type || item->type() == UBGraphicsSvgItem::Type || item->type() == UBGraphicsTextItem::Type || item->type() == UBGraphicsStrokesGroup::Type diff --git a/src/domain/UBGraphicsGroupContainerItem.cpp b/src/domain/UBGraphicsGroupContainerItem.cpp index a4f45a62..646f8b6d 100644 --- a/src/domain/UBGraphicsGroupContainerItem.cpp +++ b/src/domain/UBGraphicsGroupContainerItem.cpp @@ -162,7 +162,10 @@ void UBGraphicsGroupContainerItem::removeFromGroup(QGraphicsItem *item) void UBGraphicsGroupContainerItem::deselectCurrentItem() { - if (mCurrentItem && mCurrentItem->type() == UBGraphicsMediaItem::Type){ + if (mCurrentItem && (mCurrentItem->type() == UBGraphicsMediaItem::Type + || mCurrentItem->type() == UBGraphicsVideoItem::Type + || mCurrentItem->type() == UBGraphicsAudioItem::Type)) + { dynamic_cast(mCurrentItem)->Delegate()->getToolBarItem()->hide(); mCurrentItem->setSelected(false); diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp index a9ed21f3..4185fe40 100644 --- a/src/domain/UBGraphicsMediaItem.cpp +++ b/src/domain/UBGraphicsMediaItem.cpp @@ -252,6 +252,12 @@ void UBGraphicsMediaItem::setMinimumSize(const QSize& size) this->setSize(width, height); } +void UBGraphicsMediaItem::setUuid(const QUuid &pUuid) +{ + UBItem::setUuid(pUuid); + setData(UBGraphicsItemData::ItemUuid, QVariant(pUuid)); +} + void UBGraphicsMediaItem::setMediaFileUrl(QUrl url) { mMediaFileUrl = url; diff --git a/src/domain/UBGraphicsMediaItem.h b/src/domain/UBGraphicsMediaItem.h index f08a5ae5..dd5ed396 100644 --- a/src/domain/UBGraphicsMediaItem.h +++ b/src/domain/UBGraphicsMediaItem.h @@ -100,6 +100,7 @@ public: virtual void setSourceUrl(const QUrl &pSourceUrl); void setSelected(bool selected); void setMinimumSize(const QSize& size); + void setUuid(const QUuid &pUuid); virtual void copyItemParameters(UBItem *copy) const;