MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improvements on the document mode behavior

Browse Source
preferencesAboutTextFull
Clément Fauconnier 6 years ago
parent 681acce85b
commit fca4b6c989
5 changed files with 106 additions and 105 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      src/document/UBDocumentContainer.h
  2. 187
      src/document/UBDocumentController.cpp
  3. 11
      src/document/UBDocumentController.h
  4. 1
      src/document/UBDocumentProxy.cpp
  5. 2
      src/gui/UBDocumentNavigator.cpp

10
src/document/UBDocumentContainer.h
Unescape View File

@ -46,7 +46,15 @@ class UBDocumentContainer : public QObject
UBDocumentProxy* selectedDocument(){return mCurrentDocument;} UBDocumentProxy* selectedDocument(){return mCurrentDocument;}
int pageCount(){return mCurrentDocument->pageCount();} int pageCount(){return mCurrentDocument->pageCount();}
const QPixmap* pageAt(int index){return mDocumentThumbs[index];} const QPixmap* pageAt(int index)
{
if (index < mDocumentThumbs.size())
return mDocumentThumbs[index];
else
{
return NULL;
}
}
static int pageFromSceneIndex(int sceneIndex); static int pageFromSceneIndex(int sceneIndex);
static int sceneIndexFromPage(int sceneIndex); static int sceneIndexFromPage(int sceneIndex);

187
src/document/UBDocumentController.cpp
Unescape View File

@ -353,8 +353,8 @@ UBDocumentTreeModel::UBDocumentTreeModel(QObject *parent) :
//rootNode->addChild(modelsNode); //rootNode->addChild(modelsNode);
UBDocumentTreeNode *trashNode = new UBDocumentTreeNode(UBDocumentTreeNode::Catalog, trashName, tr("Trash")); UBDocumentTreeNode *trashNode = new UBDocumentTreeNode(UBDocumentTreeNode::Catalog, trashName, tr("Trash"));
rootNode->addChild(trashNode); rootNode->addChild(trashNode);
UBDocumentTreeNode *untitledDocumentsNode = new UBDocumentTreeNode(UBDocumentTreeNode::Catalog, UBPersistenceManager::untitledDocumentsName, tr("Untitled documents")); //UBDocumentTreeNode *untitledDocumentsNode = new UBDocumentTreeNode(UBDocumentTreeNode::Catalog, UBPersistenceManager::untitledDocumentsName, tr("Untitled documents"));
myDocsNode->addChild(untitledDocumentsNode); //myDocsNode->addChild(untitledDocumentsNode);
setRootNode(rootNode); setRootNode(rootNode);
@ -1353,7 +1353,13 @@ void UBDocumentTreeView::dragLeaveEvent(QDragLeaveEvent *event)
void UBDocumentTreeView::dragMoveEvent(QDragMoveEvent *event) void UBDocumentTreeView::dragMoveEvent(QDragMoveEvent *event)
{ {
bool acceptIt = isAcceptable(selectedIndexes().first(), indexAt(event->pos())); QModelIndex index;
if (selectedIndexes().count() > 0)
{
index = selectedIndexes().first();
}
bool acceptIt = isAcceptable(index, indexAt(event->pos()));
if (event->mimeData()->hasFormat(UBApplication::mimeTypeUniboardPage)) { if (event->mimeData()->hasFormat(UBApplication::mimeTypeUniboardPage)) {
UBSortFilterProxyModel *proxy = dynamic_cast<UBSortFilterProxyModel*>(model()); UBSortFilterProxyModel *proxy = dynamic_cast<UBSortFilterProxyModel*>(model());
@ -1400,21 +1406,21 @@ void UBDocumentTreeView::dropEvent(QDropEvent *event)
QModelIndexList dropIndex = mapIndexesToSource(selectedIndexes()); QModelIndexList dropIndex = mapIndexesToSource(selectedIndexes());
//clear the selection right after //clear the selection right after
selectionModel()->clearSelection(); //selectionModel()->clearSelection();
bool isUBPage = event->mimeData()->hasFormat(UBApplication::mimeTypeUniboardPage); bool isUBPage = event->mimeData()->hasFormat(UBApplication::mimeTypeUniboardPage);
bool inModel = false;
//just check the first index, because the selection is exclusive between
//myDocuments, Model and Tash
bool isSourceAModel = false;
//issue 1629 - NNE - 20131212 //issue 1629 - NNE - 20131212
bool targetIsInTrash = docModel->inTrash(targetIndex) || docModel->trashIndex() == targetIndex; bool targetIsInTrash = docModel->inTrash(targetIndex) || docModel->trashIndex() == targetIndex;
bool targetIsInMyDocuments = docModel->inMyDocuments(targetIndex) || docModel->myDocumentsIndex() == targetIndex;
if (isUBPage) { if (!targetIsInMyDocuments && !targetIsInTrash)
return;
if (isUBPage)
{
UBDocumentProxy *targetDocProxy = docModel->proxyData(targetIndex); UBDocumentProxy *targetDocProxy = docModel->proxyData(targetIndex);
const UBMimeData *ubMime = qobject_cast <const UBMimeData*>(event->mimeData()); const UBMimeData *ubMime = qobject_cast <const UBMimeData*>(event->mimeData());
if (!targetDocProxy || !ubMime || !ubMime->items().count()) { if (!targetDocProxy || !ubMime || !ubMime->items().count()) {
qDebug() << "an error ocured while parsing " << UBApplication::mimeTypeUniboardPage; qDebug() << "an error ocured while parsing " << UBApplication::mimeTypeUniboardPage;
@ -1440,40 +1446,15 @@ void UBDocumentTreeView::dropEvent(QDropEvent *event)
docModel->setHighLighted(QModelIndex()); docModel->setHighLighted(QModelIndex());
} }
else if(isSourceAModel){
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
if(targetIsInTrash){
//issue 1629 - NNE - 20131212 : If the source is a model and we want to delete it
UBApplication::documentController->moveIndexesToTrash(dropIndex, docModel);
}else{
UBDocumentTreeNode* node = docModel->nodeFromIndex(targetIndex);
QModelIndex targetParentIndex;
if(node->nodeType() == UBDocumentTreeNode::Catalog)
targetParentIndex = docModel->indexForNode(node);
else
targetParentIndex = docModel->indexForNode(node->parentNode());
docModel->copyIndexToNewParent(dropIndex, targetParentIndex,UBDocumentTreeModel::aContentCopy); if(targetIsInTrash)
docModel->setHighLighted(QModelIndex()); {
} UBApplication::documentController->moveIndexesToTrash(dropIndex, docModel);
}else{
QApplication::restoreOverrideCursor(); docModel->moveIndexes(dropIndex, targetIndex);
} }
else if(!inModel){
//issue 1632 - NNE - 20131212
if(targetIsInTrash){
UBApplication::documentController->moveIndexesToTrash(dropIndex, docModel);
}else{
docModel->moveIndexes(dropIndex, targetIndex);
}
expand(proxy->mapFromSource(targetIndex)); expand(proxy->mapFromSource(targetIndex));
//issue 1632 - NNE - 20131212 : END
}else if(inModel){
event->setDropAction(Qt::CopyAction);
}
QTreeView::dropEvent(event); QTreeView::dropEvent(event);
} }
@ -2231,6 +2212,9 @@ void UBDocumentController::deleteSelectedItem()
QModelIndexList indexes = selectedTreeIndexes(); QModelIndexList indexes = selectedTreeIndexes();
if (!UBApplication::mainWindow->yesNoQuestion(tr("Remove Item"), tr("Are you sure you want to remove the selected item(s) ?")))
return;
//we iterate in backward because if we iterate in normal order, //we iterate in backward because if we iterate in normal order,
//indexes are invalid after the first deletion //indexes are invalid after the first deletion
for(int i = indexes.size()-1; i >= 0; i--){ for(int i = indexes.size()-1; i >= 0; i--){
@ -2244,62 +2228,62 @@ void UBDocumentController::deleteSelectedItem()
//N/C - NNE - 20140408 : END //N/C - NNE - 20140408 : END
switch (deletionForSelection) { switch (deletionForSelection) {
case DeletePage: case DeletePage:
{ {
deletePages(mDocumentUI->thumbnailWidget->selectedItems()); deletePages(mDocumentUI->thumbnailWidget->selectedItems());
break; break;
} }
case MoveToTrash: case MoveToTrash:
{ {
moveToTrash(currentIndex, docModel); moveToTrash(currentIndex, docModel);
break; break;
} }
case CompleteDelete: case CompleteDelete:
{ {
deleteIndexAndAssociatedData(currentIndex); deleteIndexAndAssociatedData(currentIndex);
break; emit documentThumbnailsUpdated(this);
} break;
case EmptyFolder: }
{ case EmptyFolder:
if (currentIndex == docModel->myDocumentsIndex()) { //Emptying "My documents". Keeping Untitled Documents {
int startInd = 0; if (currentIndex == docModel->myDocumentsIndex()) { //Emptying "My documents". Keeping Untitled Documents
while (docModel->rowCount(currentIndex)) { int startInd = 0;
QModelIndex testSubINdecurrentIndex = docModel->index(startInd, 0, currentIndex); while (docModel->rowCount(currentIndex)) {
if (testSubINdecurrentIndex == docModel->untitledDocumentsIndex()) { QModelIndex testSubINdecurrentIndex = docModel->index(startInd, 0, currentIndex);
emptyFolder(testSubINdecurrentIndex, MoveToTrash); if (testSubINdecurrentIndex == docModel->untitledDocumentsIndex()) {
startInd++; emptyFolder(testSubINdecurrentIndex, MoveToTrash);
continue; startInd++;
} continue;
if (!testSubINdecurrentIndex.isValid()) { }
break; if (!testSubINdecurrentIndex.isValid()) {
break;
}
docModel->moveIndex(testSubINdecurrentIndex, docModel->trashIndex());
} }
docModel->moveIndex(testSubINdecurrentIndex, docModel->trashIndex()); //issue 1629 - NNE - 20131105
//Here, we are sure that the current scene has been deleted
createNewDocumentInUntitledFolder();
} else {
//issue 1629 - NNE - 20131105
//Check if we will delete the current scene
UBDocumentTreeNode *currentNode = docModel->nodeFromIndex(currentIndex);
bool deleteCurrentScene = currentNode->findNode(docModel->nodeFromIndex(docModel->currentIndex()));
emptyFolder(currentIndex, MoveToTrash); //Empty constant folder
if(deleteCurrentScene) createNewDocumentInUntitledFolder();
} }
//issue 1629 - NNE - 20131105
//Here, we are sure that the current scene has been deleted
createNewDocumentInUntitledFolder();
} else {
//issue 1629 - NNE - 20131105
//Check if we will delete the current scene
UBDocumentTreeNode *currentNode = docModel->nodeFromIndex(currentIndex);
bool deleteCurrentScene = currentNode->findNode(docModel->nodeFromIndex(docModel->currentIndex()));
emptyFolder(currentIndex, MoveToTrash); //Empty constant folder break;
}
if(deleteCurrentScene) createNewDocumentInUntitledFolder(); case EmptyTrash:
{
emptyFolder(currentIndex, CompleteDelete); // Empty trash folder
break;
} }
break;
}
case EmptyTrash:
{
emptyFolder(currentIndex, CompleteDelete); // Empty trash folder
break;
}
} }
} }
} }
//N/C - NNE - 20140410 //N/C - NNE - 20140410
@ -2355,11 +2339,11 @@ void UBDocumentController::moveIndexesToTrash(const QModelIndexList &list, UBDoc
deleteCurrentScene = false; deleteCurrentScene = false;
} }
} }
} }
else else
{ {
setDocument(NULL); UBDocumentProxy* proxy = docModel->proxyForIndex(currentScene);
setDocument(proxy);
} }
docModel->moveIndexes(list, docModel->trashIndex()); docModel->moveIndexes(list, docModel->trashIndex());
@ -2368,8 +2352,7 @@ void UBDocumentController::moveIndexesToTrash(const QModelIndexList &list, UBDoc
createNewDocumentInUntitledFolder(); createNewDocumentInUntitledFolder();
} }
selectionModel->clearSelection(); //selectionModel->clearSelection();
} }
//N/C - NNE - 20140410 : END //N/C - NNE - 20140410 : END
@ -2960,7 +2943,6 @@ void UBDocumentController::paste()
void UBDocumentController::focusChanged(QWidget *old, QWidget *current) void UBDocumentController::focusChanged(QWidget *old, QWidget *current)
{ {
Q_UNUSED(old);
UBDocumentTreeModel *treeModel = UBPersistenceManager::persistenceManager()->mDocumentTreeStructureModel; UBDocumentTreeModel *treeModel = UBPersistenceManager::persistenceManager()->mDocumentTreeStructureModel;
if (current == mDocumentUI->thumbnailWidget) if (current == mDocumentUI->thumbnailWidget)
@ -2992,7 +2974,8 @@ void UBDocumentController::focusChanged(QWidget *old, QWidget *current)
old != mDocumentUI->documentTreeView && old != mDocumentUI->documentTreeView &&
old != mDocumentUI->documentZoomSlider) old != mDocumentUI->documentZoomSlider)
{ {
mSelectionType = None; if (current && (current->metaObject()->className() != QPushButton::staticMetaObject.className()))
mSelectionType = None;
} }
} }
} }
@ -3164,7 +3147,7 @@ void UBDocumentController::deletePages(QList<QGraphicsItem *> itemsToDelete)
} }
} }
if(UBApplication::mainWindow->yesNoQuestion(tr("Remove Page"),tr("This is an irreversible action!") +"\n\n" + tr("Are you sure you want to remove %n page(s) from the selected document '%1'?", "", sceneIndexes.count()).arg(proxy->metaData(UBSettings::documentName).toString()))) if(UBApplication::mainWindow->yesNoQuestion(tr("Remove Page"), tr("Are you sure you want to remove %n page(s) from the selected document '%1'?", "", sceneIndexes.count()).arg(proxy->metaData(UBSettings::documentName).toString())))
{ {
UBDocumentContainer::deletePages(sceneIndexes); UBDocumentContainer::deletePages(sceneIndexes);
emit UBApplication::boardController->documentThumbnailsUpdated(this); emit UBApplication::boardController->documentThumbnailsUpdated(this);
@ -3284,14 +3267,15 @@ bool UBDocumentController::firstAndOnlySceneSelected() const
return false; return false;
} }
void UBDocumentController::refreshDocumentThumbnailsView(UBDocumentContainer*) void UBDocumentController:: refreshDocumentThumbnailsView(UBDocumentContainer*)
{ {
UBDocumentTreeModel *docModel = UBPersistenceManager::persistenceManager()->mDocumentTreeStructureModel; UBDocumentTreeModel *docModel = UBPersistenceManager::persistenceManager()->mDocumentTreeStructureModel;
UBDocumentProxy *currentDocumentProxy = selectedDocument(); UBDocumentProxy *currentDocumentProxy = selectedDocument();
QModelIndex current = docModel->indexForProxy(currentDocumentProxy); QModelIndex current = docModel->indexForProxy(currentDocumentProxy);
if (!current.isValid()) { if (!current.isValid())
{
mDocumentUI->thumbnailWidget->setGraphicsItems(QList<QGraphicsItem*>() mDocumentUI->thumbnailWidget->setGraphicsItems(QList<QGraphicsItem*>()
, QList<QUrl>() , QList<QUrl>()
, QStringList() , QStringList()
@ -3348,7 +3332,8 @@ void UBDocumentController::refreshDocumentThumbnailsView(UBDocumentContainer*)
mDocumentUI->thumbnailWidget->ensureVisible(0, 0, 10, 10); mDocumentUI->thumbnailWidget->ensureVisible(0, 0, 10, 10);
if (selection) { if (selection)
{
disconnect(mDocumentUI->thumbnailWidget->scene(), SIGNAL(selectionChanged()), this, SLOT(pageSelectionChanged())); disconnect(mDocumentUI->thumbnailWidget->scene(), SIGNAL(selectionChanged()), this, SLOT(pageSelectionChanged()));
UBSceneThumbnailPixmap *currentScene = dynamic_cast<UBSceneThumbnailPixmap*>(selection); UBSceneThumbnailPixmap *currentScene = dynamic_cast<UBSceneThumbnailPixmap*>(selection);
if (currentScene) if (currentScene)

11
src/document/UBDocumentController.h
Unescape View File

@ -111,7 +111,14 @@ public:
void removeChild(int index); void removeChild(int index);
UBDocumentProxy *proxyData() const {return mProxy;} UBDocumentProxy *proxyData() const {return mProxy;}
bool isRoot() {return !mParent;} bool isRoot() {return !mParent;}
bool isTopLevel() {return mParent && !mParent->mParent;} bool isTopLevel()
{
if (mParent)
{
return !mParent->mParent;
}
else return false;
}
UBDocumentTreeNode *clone(); UBDocumentTreeNode *clone();
QString dirPathInHierarchy(); QString dirPathInHierarchy();
@ -216,7 +223,7 @@ public:
QPersistentModelIndex myDocumentsIndex() const {return mMyDocuments;} QPersistentModelIndex myDocumentsIndex() const {return mMyDocuments;}
QPersistentModelIndex trashIndex() const {return mTrash;} QPersistentModelIndex trashIndex() const {return mTrash;}
QPersistentModelIndex untitledDocumentsIndex() const {return mUntitledDocuments;} QPersistentModelIndex untitledDocumentsIndex() const {return mMyDocuments;}
UBDocumentTreeNode *nodeFromIndex(const QModelIndex &pIndex) const; UBDocumentTreeNode *nodeFromIndex(const QModelIndex &pIndex) const;
static bool nodeLessThan(const UBDocumentTreeNode *firstIndex, const UBDocumentTreeNode *secondIndex); static bool nodeLessThan(const UBDocumentTreeNode *firstIndex, const UBDocumentTreeNode *secondIndex);
void setHighLighted(const QModelIndex &newHighLighted) {mHighLighted = newHighLighted;} void setHighLighted(const QModelIndex &newHighLighted) {mHighLighted = newHighLighted;}

1
src/document/UBDocumentProxy.cpp
Unescape View File

@ -42,6 +42,7 @@
UBDocumentProxy::UBDocumentProxy() UBDocumentProxy::UBDocumentProxy()
: mPageCount(0) : mPageCount(0)
, mPageDpi(0) , mPageDpi(0)
, mPersistencePath("")
{ {
init(); init();
} }

2
src/gui/UBDocumentNavigator.cpp
Unescape View File

@ -127,7 +127,7 @@ void UBDocumentNavigator::generateThumbnails(UBDocumentContainer* source)
{ {
//claudio This is a very bad hack and shows a architectural problem //claudio This is a very bad hack and shows a architectural problem
// source->selectedDocument()->pageCount() != source->pageCount() // source->selectedDocument()->pageCount() != source->pageCount()
if(i>=source->pageCount() || source->pageAt(i)->isNull()) if(i>=source->pageCount() || !source->pageAt(i))
source->insertThumbPage(i); source->insertThumbPage(i);
const QPixmap* pix = source->pageAt(i); const QPixmap* pix = source->pageAt(i);

Write Preview
Loading…
Cancel
Save