From 1f5c8ddb20fc349e86bb2c02afbd6bb08a69b8ea Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 9 Sep 2013 09:53:33 +0200 Subject: [PATCH 1/4] fixed windows path --- release.win7.vc9.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index cfa52588..8a308438 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -38,7 +38,7 @@ echo %PATH% REM Third party impoter application set IMPORTER_NAME=OpenBoardImporter -set IMPORTER_PATH="%cd%\..\OpenSankoreToOpenBoard" +set IMPORTER_PATH="%cd%\..\OpenBoard-Importer" IF NOT EXIST "%IMPORTER_PATH%" GOTO EXIT_WITH_ERROR set HOME_DIR="%cd%" From 67e4b321099cff9d1d6dd39910e85ef5f71ad405 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 9 Sep 2013 18:30:53 +0200 Subject: [PATCH 2/4] fixed trasparency problem --- src/tools/UBGraphicsCurtainItem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/UBGraphicsCurtainItem.cpp b/src/tools/UBGraphicsCurtainItem.cpp index 0e35f0e3..93389975 100644 --- a/src/tools/UBGraphicsCurtainItem.cpp +++ b/src/tools/UBGraphicsCurtainItem.cpp @@ -124,7 +124,7 @@ void UBGraphicsCurtainItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void UBGraphicsCurtainItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { QColor color = drawColor(); - + painter->setCompositionMode(QPainter::CompositionMode_SourceOver); if(widget == UBApplication::boardController->controlView()->viewport()) { color = UBSettings::paletteColor; From 2379101adb01db35d9dcb5ceed37278871751546 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 10 Sep 2013 12:58:00 +0200 Subject: [PATCH 3/4] fixed path for importer --- OpenBoard.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenBoard.iss b/OpenBoard.iss index e023cf97..d8756ae9 100644 --- a/OpenBoard.iss +++ b/OpenBoard.iss @@ -92,7 +92,7 @@ Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDi Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenBoard\plugins\playlistformats"; Flags: ignoreversion ;OpenBoardImporter -Source: "..\OpenSankoreToOpenBoard\release\OpenBoardImporter.exe"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion +Source: "..\OpenBoard-Importer\release\OpenBoardImporter.exe"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion Source: "..\Qt-4.8\lib\QtGui4.dll"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion Source: "..\Qt-4.8\lib\QtCore4.dll"; DestDir: "c:\OpenBoard\Importer"; Flags: ignoreversion From 7a4a2d0f6ee4643fb3aaf797ff2e5397f064bf66 Mon Sep 17 00:00:00 2001 From: Ilia Ryabokon Date: Wed, 2 Oct 2013 15:18:30 +0300 Subject: [PATCH 4/4] Group container copy scene --- src/domain/UBGraphicsGroupContainerItem.cpp | 8 ++++++++ src/gui/UBDocumentTreeWidget.cpp | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/domain/UBGraphicsGroupContainerItem.cpp b/src/domain/UBGraphicsGroupContainerItem.cpp index 81ced6f3..dcc94b97 100644 --- a/src/domain/UBGraphicsGroupContainerItem.cpp +++ b/src/domain/UBGraphicsGroupContainerItem.cpp @@ -205,6 +205,14 @@ UBGraphicsGroupContainerItem *UBGraphicsGroupContainerItem::deepCopy() const copyItemParameters(copy); + foreach (QGraphicsItem *it, childItems()) { + UBItem *childAsUBItem = dynamic_cast(it); + if (childAsUBItem) { + QGraphicsItem *cloneItem = dynamic_cast(childAsUBItem->deepCopy()); + copy->addToGroup(cloneItem); + } + } + return copy; } diff --git a/src/gui/UBDocumentTreeWidget.cpp b/src/gui/UBDocumentTreeWidget.cpp index d34ffdbb..749878b8 100644 --- a/src/gui/UBDocumentTreeWidget.cpp +++ b/src/gui/UBDocumentTreeWidget.cpp @@ -22,9 +22,6 @@ * along with OpenBoard. If not, see . */ - - - #include "UBDocumentTreeWidget.h" #include "document/UBDocumentProxy.h" @@ -323,6 +320,7 @@ void UBDocumentTreeWidget::dropEvent(QDropEvent *event) if (scene) { UBGraphicsScene* sceneClone = scene->sceneDeepCopy(); +// UBGraphicsScene* sceneClone = scene; UBDocumentProxy *targetDocProxy = targetProxyTreeItem->proxy();