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

src/adaptors/UBCFFSubsetAdaptor.cpp

@@ -738,7 +738,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgImage(const QDomElement &ele
         }
     }
 
-   UBGraphicsPixmapItem *pixItem = mCurrentScene->addPixmap(pix);
+   UBGraphicsPixmapItem *pixItem = mCurrentScene->addPixmap(pix, NULL);
    QTransform transform;
    QString textTransform = element.attribute(aTransform);
 

src/board/UBBoardController.cpp

@@ -816,7 +816,7 @@ void UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QString
         img.loadFromData(pData);
         QPixmap pix = QPixmap::fromImage(img);
 
-        UBGraphicsPixmapItem* pixItem = mActiveScene->addPixmap(pix, pPos, 1.);
+        UBGraphicsPixmapItem* pixItem = mActiveScene->addPixmap(pix, NULL, pPos, 1.);
         pixItem->setSourceUrl(sourceUrl);
 
         if (isBackground)
@@ -1986,7 +1986,7 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
         // validate that the image is really an image, webkit does not fill properly the image mime data
         if (pix.width() != 0 && pix.height() != 0)
         {
-            mActiveScene->addPixmap(pix, pPos, 1.);
+            mActiveScene->addPixmap(pix, NULL, pPos, 1.);
             return;
         }
     }

src/board/UBBoardPaletteManager.cpp

@@ -793,7 +793,7 @@ void UBBoardPaletteManager::addItemToCurrentPage()
         UBApplication::boardController->downloadURL(mItemUrl);
     else
     {
-        UBGraphicsPixmapItem* item = UBApplication::boardController->activeScene()->addPixmap(mPixmap, mPos, mScaleFactor);
+        UBGraphicsPixmapItem* item = UBApplication::boardController->activeScene()->addPixmap(mPixmap, NULL, mPos, mScaleFactor);
 
         item->setSourceUrl(mItemUrl);
         item->setSelected(true);

src/board/UBLibraryController.cpp

@@ -505,7 +505,7 @@ void UBLibraryController::setItemAsBackground(UBLibElement* image)
     }
     else{
         QPixmap pix(image->path().toLocalFile());
-        UBGraphicsPixmapItem* boardItem = activeScene()->addPixmap(pix, QPointF(0, 0));
+        UBGraphicsPixmapItem* boardItem = activeScene()->addPixmap(pix, activeScene()->backgroundObject(), QPointF(0, 0));
         activeScene()->setAsBackgroundObject(boardItem, true);
     }
 }
@@ -679,7 +679,7 @@ void UBLibraryController::addImagesToCurrentPage(const QList<QUrl>& images)
                 itemInScene = activeScene()->addSvg(url, pos);
             } else {
                 itemInScene = activeScene()->addPixmap(QPixmap(
-                        url.toLocalFile()), pos);
+                        url.toLocalFile()), NULL, pos);
             }
         }
 

src/core/UBDocumentManager.cpp

@@ -263,7 +263,7 @@ int UBDocumentManager::addImageAsPageToDocument(const QStringList& filenames, UB
                 }
                 else
                 {
-                    gi = scene->addPixmap(pix, QPointF(0, 0));
+                    gi = scene->addPixmap(pix, NULL, QPointF(0, 0));
                 }
             }
 

src/domain/UBGraphicsScene.cpp

@@ -1044,7 +1044,7 @@ void UBGraphicsScene::clearAnnotations()
 }
 
 
-UBGraphicsPixmapItem* UBGraphicsScene::addPixmap(const QPixmap& pPixmap, const QPointF& pPos, qreal pScaleFactor, bool pUseAnimation)
+UBGraphicsPixmapItem* UBGraphicsScene::addPixmap(const QPixmap& pPixmap, QGraphicsItem* replaceFor, const QPointF& pPos, qreal pScaleFactor, bool pUseAnimation)
 {
     UBGraphicsPixmapItem* pixmapItem = new UBGraphicsPixmapItem();
 
@@ -1061,7 +1061,7 @@ UBGraphicsPixmapItem* UBGraphicsScene::addPixmap(const QPixmap& pPixmap, const Q
     addItem(pixmapItem);
 
     if (enableUndoRedoStack) { //should be deleted after scene own undo stack implemented
-        UBGraphicsItemUndoCommand* uc = new UBGraphicsItemUndoCommand(this, 0, pixmapItem);
+        UBGraphicsItemUndoCommand* uc = new UBGraphicsItemUndoCommand(this, replaceFor, pixmapItem);
         UBApplication::undoStack->push(uc);
     }
 

src/domain/UBGraphicsScene.h

@@ -279,7 +279,11 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
 
         void deselectAllItems();
 
-        UBGraphicsPixmapItem* addPixmap(const QPixmap& pPixmap, const QPointF& pPos = QPointF(0,0), qreal scaleFactor = 1.0, bool pUseAnimation = false);
+        UBGraphicsPixmapItem* addPixmap(const QPixmap& pPixmap, 
+            QGraphicsItem* replaceFor,
+            const QPointF& pPos = QPointF(0,0), 
+            qreal scaleFactor = 1.0, 
+            bool pUseAnimation = false);
 
         void textUndoCommandAdded(UBGraphicsTextItem *textItem);