MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into claudio-dev

Browse Source
preferencesAboutTextFull
Claudio Valerio 12 years ago
parent 5d0464ea80 db10e4fbc0
commit 9b33509036
4 changed files with 89 additions and 65 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 31
      src/board/UBBoardController.cpp
  2. 1
      src/core/UB.h
  3. 1
      src/domain/UBGraphicsGroupContainerItemDelegate.cpp
  4. 119
      src/domain/domain.pri

31
src/board/UBBoardController.cpp
Unescape View File

@ -551,9 +551,13 @@ void UBBoardController::duplicateItem(UBItem *item)
itemSize = commonItem->boundingRect().size(); itemSize = commonItem->boundingRect().size();
} }
UBMimeType::Enum itemMimeType;
QString contentTypeHeader = UBFileSystemUtils::mimeTypeFromFileName(item->sourceUrl().toLocalFile()); QString contentTypeHeader = UBFileSystemUtils::mimeTypeFromFileName(item->sourceUrl().toLocalFile());
if(NULL != qgraphicsitem_cast<UBGraphicsGroupContainerItem*>(commonItem)){
UBMimeType::Enum itemMimeType = UBFileSystemUtils::mimeTypeFromString(contentTypeHeader); itemMimeType = UBMimeType::Group;
}else{
itemMimeType = UBFileSystemUtils::mimeTypeFromString(contentTypeHeader);
}
switch(static_cast<int>(itemMimeType)) switch(static_cast<int>(itemMimeType))
{ {
@ -598,6 +602,29 @@ void UBBoardController::duplicateItem(UBItem *item)
pixitem->pixmap().save(&buffer, format.toLatin1()); pixitem->pixmap().save(&buffer, format.toLatin1());
} }
}break; }break;
case UBMimeType::Group:
{
UBGraphicsGroupContainerItem* groupItem = dynamic_cast<UBGraphicsGroupContainerItem*>(item);
if(groupItem){
QList<QGraphicsItem*> children = groupItem->childItems();
foreach(QGraphicsItem* pIt, children){
UBItem* pItem = dynamic_cast<UBItem*>(pIt);
if(NULL != pItem){
duplicateItem(pItem); // The duplication already copies the item parameters
QGraphicsItem* pDuplicatedItem = dynamic_cast<QGraphicsItem*>((mActiveScene->children().last()));
if(NULL != pDuplicatedItem){
pDuplicatedItem->setSelected(true);
}
}
}
groupItem->setSelected(false);
UBApplication::mainWindow->actionGroupItems->trigger();
}
return;
break;
}
case UBMimeType::UNKNOWN: case UBMimeType::UNKNOWN:
{ {
QGraphicsItem *gitem = dynamic_cast<QGraphicsItem*>(item->deepCopy()); QGraphicsItem *gitem = dynamic_cast<QGraphicsItem*>(item->deepCopy());

1
src/core/UB.h
Unescape View File

@ -33,6 +33,7 @@ struct UBMimeType
Flash, Flash,
PDF, PDF,
UniboardTool, UniboardTool,
Group,
UNKNOWN UNKNOWN
}; };
}; };

1
src/domain/UBGraphicsGroupContainerItemDelegate.cpp
Unescape View File

@ -19,6 +19,7 @@ UBGraphicsGroupContainerItemDelegate::UBGraphicsGroupContainerItemDelegate(QGrap
//Wrapper function. Use it to set correct data() to QGraphicsItem as well //Wrapper function. Use it to set correct data() to QGraphicsItem as well
setFlippable(false); setFlippable(false);
setRotatable(false); setRotatable(false);
setCanDuplicate(true);
} }
UBGraphicsGroupContainerItem *UBGraphicsGroupContainerItemDelegate::delegated() UBGraphicsGroupContainerItem *UBGraphicsGroupContainerItemDelegate::delegated()

119
src/domain/domain.pri
Unescape View File

@ -1,63 +1,58 @@
HEADERS += src/domain/UBGraphicsScene.h \
src/domain/UBGraphicsItemUndoCommand.h \
src/domain/UBGraphicsTextItemUndoCommand.h \
src/domain/UBGraphicsItemTransformUndoCommand.h \
src/domain/UBGraphicsPixmapItem.h \
src/domain/UBDocumentUndoCommand.h \
src/domain/UBPageSizeUndoCommand.h \
src/domain/UBGraphicsProxyWidget.h \
src/domain/UBGraphicsWebView.h \
src/domain/UBGraphicsSvgItem.h \
src/domain/UBGraphicsPolygonItem.h \
src/domain/UBItem.h \
src/domain/UBGraphicsWidgetItem.h \
src/domain/UBGraphicsPDFItem.h \
src/domain/UBGraphicsTextItem.h \
src/domain/UBResizableGraphicsItem.h \
src/domain/UBGraphicsStroke.h \
src/domain/UBGraphicsMediaItem.h \
src/domain/UBAbstractUndoCommand.h \
src/domain/UBGraphicsGroupContainerItem.h \
src/domain/UBGraphicsGroupContainerItemDelegate.h \
src/domain/UBGraphicsStrokesGroup.h \
src/domain/UBGraphicsItemGroupUndoCommand.h \
src/domain/UBGraphicsItemDelegate.h \
src/domain/UBGraphicsTextItemDelegate.h \
src/domain/UBGraphicsDelegateFrame.h \
src/domain/UBGraphicsWidgetItemDelegate.h \
src/domain/UBGraphicsMediaItemDelegate.h
HEADERS += src/domain/UBGraphicsScene.h \ SOURCES += src/domain/UBGraphicsScene.cpp \
src/domain/UBGraphicsItemUndoCommand.h \ src/domain/UBGraphicsItemUndoCommand.cpp \
src/domain/UBGraphicsTextItemUndoCommand.h \ src/domain/UBGraphicsTextItemUndoCommand.cpp \
src/domain/UBGraphicsItemTransformUndoCommand.h \ src/domain/UBGraphicsItemTransformUndoCommand.cpp \
src/domain/UBGraphicsPixmapItem.h \ src/domain/UBGraphicsPixmapItem.cpp \
src/domain/UBDocumentUndoCommand.h \ src/domain/UBDocumentUndoCommand.cpp \
src/domain/UBPageSizeUndoCommand.h \ src/domain/UBPageSizeUndoCommand.cpp \
src/domain/UBGraphicsProxyWidget.h \ src/domain/UBGraphicsProxyWidget.cpp \
src/domain/UBGraphicsWebView.h \ src/domain/UBGraphicsWebView.cpp \
src/domain/UBGraphicsSvgItem.h \ src/domain/UBGraphicsSvgItem.cpp \
src/domain/UBGraphicsPolygonItem.h \ src/domain/UBGraphicsPolygonItem.cpp \
src/domain/UBItem.h \ src/domain/UBItem.cpp \
src/domain/UBGraphicsWidgetItem.h \ src/domain/UBGraphicsVideoItem.cpp \
src/domain/UBGraphicsPDFItem.h \ src/domain/UBGraphicsWidgetItem.cpp \
src/domain/UBGraphicsTextItem.h \ src/domain/UBGraphicsPDFItem.cpp \
src/domain/UBResizableGraphicsItem.h \ src/domain/UBGraphicsTextItem.cpp \
src/domain/UBGraphicsStroke.h \ src/domain/UBResizableGraphicsItem.cpp \
src/domain/UBGraphicsMediaItem.h \ src/domain/UBGraphicsStroke.cpp \
src/domain/UBAbstractUndoCommand.h\ src/domain/UBGraphicsMediaItem.cpp \
src/domain/UBGraphicsGroupContainerItem.h \ src/domain/UBAbstractUndoCommand.cpp \
src/domain/UBGraphicsGroupContainerItemDelegate.h \ src/domain/ubgraphicsgroupcontaineritem.cpp \
src/domain/UBGraphicsStrokesGroup.h \ src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \
src/domain/UBGraphicsItemGroupUndoCommand.h src/domain/UBGraphicsStrokesGroup.cpp \
src/domain/UBGraphicsItemGroupUndoCommand.cpp \
HEADERS += src/domain/UBGraphicsItemDelegate.h \ src/domain/UBGraphicsItemDelegate.cpp \
src/domain/UBGraphicsTextItemDelegate.h \ src/domain/UBGraphicsTextItemDelegate.cpp \
src/domain/UBGraphicsDelegateFrame.h \ src/domain/UBGraphicsMediaItemDelegate.cpp \
src/domain/UBGraphicsWidgetItemDelegate.h \ src/domain/UBGraphicsDelegateFrame.cpp \
src/domain/UBGraphicsMediaItemDelegate.h src/domain/UBGraphicsWidgetItemDelegate.cpp
SOURCES += src/domain/UBGraphicsScene.cpp \
src/domain/UBGraphicsItemUndoCommand.cpp \
src/domain/UBGraphicsTextItemUndoCommand.cpp \
src/domain/UBGraphicsItemTransformUndoCommand.cpp \
src/domain/UBGraphicsPixmapItem.cpp \
src/domain/UBDocumentUndoCommand.cpp \
src/domain/UBPageSizeUndoCommand.cpp \
src/domain/UBGraphicsProxyWidget.cpp \
src/domain/UBGraphicsWebView.cpp \
src/domain/UBGraphicsSvgItem.cpp \
src/domain/UBGraphicsPolygonItem.cpp \
src/domain/UBItem.cpp \
src/domain/UBGraphicsVideoItem.cpp \
src/domain/UBGraphicsWidgetItem.cpp \
src/domain/UBGraphicsPDFItem.cpp \
src/domain/UBGraphicsTextItem.cpp \
src/domain/UBResizableGraphicsItem.cpp \
src/domain/UBGraphicsStroke.cpp \
src/domain/UBGraphicsMediaItem.cpp \
src/domain/UBAbstractUndoCommand.cpp \
src/domain/ubgraphicsgroupcontaineritem.cpp \
src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \
src/domain/UBGraphicsStrokesGroup.cpp \
src/domain/UBGraphicsItemGroupUndoCommand.cpp
SOURCES += src/domain/UBGraphicsItemDelegate.cpp \
src/domain/UBGraphicsTextItemDelegate.cpp \
src/domain/UBGraphicsMediaItemDelegate.cpp \
src/domain/UBGraphicsDelegateFrame.cpp \
src/domain/UBGraphicsWidgetItemDelegate.cpp \

Write Preview
Loading…
Cancel
Save