Commit 08e7ae84 authored by Clément Fauconnier's avatar Clément Fauconnier

revert previous fix + code cleaning

parent 79544999
...@@ -1542,7 +1542,6 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy, ...@@ -1542,7 +1542,6 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
mActiveSceneIndex = index; mActiveSceneIndex = index;
setDocument(pDocumentProxy, forceReload); setDocument(pDocumentProxy, forceReload);
emit initThumbnailsRequired(this);
updateSystemScaleFactor(); updateSystemScaleFactor();
mControlView->setScene(mActiveScene); mControlView->setScene(mActiveScene);
......
...@@ -52,6 +52,7 @@ void UBDocumentContainer::setDocument(UBDocumentProxy* document, bool forceReloa ...@@ -52,6 +52,7 @@ void UBDocumentContainer::setDocument(UBDocumentProxy* document, bool forceReloa
{ {
mCurrentDocument = document; mCurrentDocument = document;
emit initThumbnailsRequired(this);
emit documentSet(mCurrentDocument); emit documentSet(mCurrentDocument);
reloadThumbnails(); reloadThumbnails();
} }
...@@ -103,8 +104,16 @@ void UBDocumentContainer::addPage(int index) ...@@ -103,8 +104,16 @@ void UBDocumentContainer::addPage(int index)
emit addThumbnailRequired(this, index); emit addThumbnailRequired(this, index);
} }
void UBDocumentContainer::clearThumbPage()
{
qDeleteAll(mDocumentThumbs);
mDocumentThumbs.clear();
}
void UBDocumentContainer::initThumbPage() void UBDocumentContainer::initThumbPage()
{ {
clearThumbPage();
for (int i=0; i < selectedDocument()->pageCount(); i++) for (int i=0; i < selectedDocument()->pageCount(); i++)
insertThumbPage(i); insertThumbPage(i);
} }
......
...@@ -53,6 +53,7 @@ class UBDocumentContainer : public QObject ...@@ -53,6 +53,7 @@ class UBDocumentContainer : public QObject
void duplicatePages(QList<int>& pageIndexes); void duplicatePages(QList<int>& pageIndexes);
bool movePageToIndex(int source, int target); bool movePageToIndex(int source, int target);
void deletePages(QList<int>& pageIndexes); void deletePages(QList<int>& pageIndexes);
void clearThumbPage();
void initThumbPage(); void initThumbPage();
void addPage(int index); void addPage(int index);
void updatePage(int index); void updatePage(int index);
......
...@@ -476,7 +476,6 @@ void UBDocumentController::openSelectedItem() ...@@ -476,7 +476,6 @@ void UBDocumentController::openSelectedItem()
if (proxy && isOKToOpenDocument(proxy)) if (proxy && isOKToOpenDocument(proxy))
{ {
UBApplication::applicationController->showBoard(); UBApplication::applicationController->showBoard();
UBApplication::applicationController->showBoard();
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment