Fixed issue sankore-33

preferencesAboutTextFull
Claudio Valerio 14 years ago
parent 80ae751e6c
commit 2f4bd3dde6
  1. 5
      src/board/UBLibraryController.cpp

@ -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
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
} }
content << element; content << element;
} }
content << addVirtualElementsForItemPath(pPath);
return content; return content;
} }

Loading…
Cancel
Save