added code lost in auto-resolved conflicts during my last 'stash apply'

src/board/UBBoardController.cpp

@@ -773,7 +773,7 @@ void UBBoardController::deleteScene(int nIndex)
         mDeletingSceneIndex = nIndex;
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
         persistCurrentScene();
-        showMessage(tr("Delete page %1 from document").arg(nIndex), true);
+        showMessage(tr("Deleting page %1").arg(nIndex+1), true);
 
         QList<int> scIndexes;
         scIndexes << nIndex;
@@ -783,7 +783,7 @@ void UBBoardController::deleteScene(int nIndex)
         if (nIndex >= pageCount())
             nIndex = pageCount()-1;
         setActiveDocumentScene(nIndex);
-        showMessage(tr("Page %1 deleted").arg(nIndex));
+        showMessage(tr("Page %1 deleted").arg(nIndex+1));
         QApplication::restoreOverrideCursor();
         mDeletingSceneIndex = -1;
     }
@@ -1564,8 +1564,6 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
 
         setDocument(pDocumentProxy, forceReload);
 
-        persistCurrentScene();
-
         updateSystemScaleFactor();
 
         mControlView->setScene(mActiveScene);

src/core/UBPersistenceManager.cpp

@@ -505,6 +505,7 @@ void UBPersistenceManager::deleteDocumentScenes(UBDocumentProxy* proxy, const QL
                 QFile::rename(source, target);
             }
 
+            UBApplication::showMessage("Moving page to trash folder...");
             insertDocumentSceneAt(trashDocProxy, scene, trashDocProxy->pageCount());
         }
     }
@@ -777,7 +778,6 @@ void UBPersistenceManager::persistDocumentScene(UBDocumentProxy* pDocumentProxy,
         if (pDocumentProxy->isModified())
             persistDocumentMetadata(pDocumentProxy, forceImmediateSaving);
 
-        UBApplication::showMessage(tr("Saving thumbnail of page %1").arg(pSceneIndex+1));
         UBThumbnailAdaptor::persistScene(pDocumentProxy, pScene, pSceneIndex);
         if(forceImmediateSaving)
             UBSvgSubsetAdaptor::persistScene(pDocumentProxy,pScene,pSceneIndex);

src/document/UBDocumentContainer.h

@@ -44,7 +44,7 @@ class UBDocumentContainer : public QObject
         void setDocument(UBDocumentProxy* document, bool forceReload = false);
 
         UBDocumentProxy* selectedDocument(){return mCurrentDocument;}
-        int pageCount(){return mDocumentThumbs.size();}
+        int pageCount(){return mCurrentDocument->pageCount();}
         const QPixmap* pageAt(int index){return mDocumentThumbs[index];}
 
         static int pageFromSceneIndex(int sceneIndex);

src/document/UBDocumentController.cpp

@@ -168,7 +168,7 @@ void UBDocumentController::selectDocument(UBDocumentProxy* proxy, bool setAsCurr
     if (selected)
     {
         setDocument(proxy);
-        reloadThumbnails();
+        emit documentThumbnailsUpdated(this);
 
         selected->setSelected(true);
 
@@ -1441,7 +1441,7 @@ void UBDocumentController::documentSceneChanged(UBDocumentProxy* proxy, int pSce
 
     if (proxy == selectedDocumentProxy())
     {
-        reloadThumbnails();
+        emit documentThumbnailsUpdated(this);
     }
 }
 

src/gui/UBThumbnailWidget.cpp

@@ -907,13 +907,15 @@ void UBDraggableThumbnail::mousePressEvent(QGraphicsSceneMouseEvent *event)
             event->accept();
             duplicatePage();
         }
+        else
+        {
+            event->ignore();
+        }
         /*
         else if(movableUp() && getIcon("moveUp")->triggered(p.x()))
             moveUpPage();
         else if (movableDown() && getIcon("moveDown")->triggered(p.x()))
             moveDownPage();*/
-
-         event->ignore();
     }
     else
     {