Skip to content

O
OpenBoard
Commit 2f4bd3dd authored by Claudio Valerio's avatar Claudio Valerio
Browse files
Options

Fixed issue sankore-33

parent 80ae751e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/board/UBLibraryController.cpp
View file @ 2f4bd3dd
...@@ -322,9 +322,9 @@ QList<UBLibElement*> UBLibraryController::addVirtualElementsForItemPath(const QS ...@@ -322,9 +322,9 @@ QList<UBLibElement*> UBLibraryController::addVirtualElementsForItemPath(const QS
{ {
QList<UBLibElement*> content; QList<UBLibElement*> content;
if (pPath == mInteractiveUserDirectoryPath.toLocalFile()){ if (pPath == mInteractiveUserDirectoryPath.toLocalFile()){
content << mInternalLibElements;
content << listElementsInPath(UBSettings::settings()->uniboardInteractiveLibraryDirectory()); content << listElementsInPath(UBSettings::settings()->uniboardInteractiveLibraryDirectory());
content << listElementsInPath(UBSettings::settings()->uniboardInteractiveFavoritesDirectory()); content << listElementsInPath(UBSettings::settings()->uniboardInteractiveFavoritesDirectory());
content << mInternalLibElements;
} }
else if (pPath == mPicturesStandardDirectoryPath.toLocalFile()){ else if (pPath == mPicturesStandardDirectoryPath.toLocalFile()){
QUrl path = QUrl::fromLocalFile(UBSettings::settings()->uniboardImageLibraryDirectory()); QUrl path = QUrl::fromLocalFile(UBSettings::settings()->uniboardImageLibraryDirectory());
...@@ -337,7 +337,7 @@ QList<UBLibElement*> UBLibraryController::addVirtualElementsForItemPath(const QS ...@@ -337,7 +337,7 @@ QList<UBLibElement*> UBLibraryController::addVirtualElementsForItemPath(const QS
QList<UBLibElement*> UBLibraryController::listElementsInPath(const QString& pPath) QList<UBLibElement*> UBLibraryController::listElementsInPath(const QString& pPath)
{ {
QList<UBLibElement*> content = addVirtualElementsForItemPath(pPath); QList<UBLibElement*> content;
QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(pPath); QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(pPath);
QFileInfoList::iterator fileInfo; QFileInfoList::iterator fileInfo;
...@@ -365,6 +365,7 @@ QList<UBLibElement*> UBLibraryController::listElementsInPath(const QString& pPat ...@@ -365,6 +365,7 @@ QList<UBLibElement*> UBLibraryController::listElementsInPath(const QString& pPat
} }
content << element; content << element;
} }
content << addVirtualElementsForItemPath(pPath);
return content; return content;
} }
......
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