Merge branch 'master' into develop

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
 

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%"

src/domain/UBGraphicsGroupContainerItem.cpp

@@ -205,6 +205,14 @@ UBGraphicsGroupContainerItem *UBGraphicsGroupContainerItem::deepCopy() const
 
     copyItemParameters(copy);
 
+    foreach (QGraphicsItem *it, childItems()) {
+        UBItem *childAsUBItem = dynamic_cast<UBItem*>(it);
+        if (childAsUBItem) {
+            QGraphicsItem *cloneItem = dynamic_cast<QGraphicsItem*>(childAsUBItem->deepCopy());
+            copy->addToGroup(cloneItem);
+        }
+    }
+
     return copy;
 }
 

src/gui/UBDocumentTreeWidget.cpp

@@ -22,9 +22,6 @@
  * along with OpenBoard. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-
 #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();
 

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;