From 173912dfb1388ebd0473c4a50534ea71f9fc0665 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 9 May 2011 11:46:16 +0200 Subject: [PATCH 1/2] Corrected an issue related to accessing the applications from the library palette. --- src/board/UBLibraryController.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 6d87190a..8cb7e2b9 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -321,8 +321,10 @@ QImage* UBLibraryController::thumbnailForFile(UBLibElement* pElement) QList UBLibraryController::addVirtualElementsForItemPath(const QString& pPath) { QList content; - if (pPath == mInteractiveUserDirectoryPath.toLocalFile()) + if (pPath == mInteractiveUserDirectoryPath.toLocalFile()){ content << mInternalLibElements; + content << listElementsInPath(UBSettings::settings()->uniboardInteractiveLibraryDirectory()); + } else if (pPath == mPicturesStandardDirectoryPath.toLocalFile()){ QUrl path = QUrl::fromLocalFile(UBSettings::settings()->uniboardImageLibraryDirectory()); userPath(path); From ef47625879a1c6c1497bfb93f945f1476cb497c9 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Mon, 9 May 2011 12:15:03 +0200 Subject: [PATCH 2/2] Added a missing line. --- src/board/UBLibraryController.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 8cb7e2b9..0ec68750 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -324,16 +324,17 @@ QList UBLibraryController::addVirtualElementsForItemPath(const QS if (pPath == mInteractiveUserDirectoryPath.toLocalFile()){ content << mInternalLibElements; content << listElementsInPath(UBSettings::settings()->uniboardInteractiveLibraryDirectory()); + content << listElementsInPath(UBSettings::settings()->uniboardInteractiveFavoritesDirectory()); } else if (pPath == mPicturesStandardDirectoryPath.toLocalFile()){ QUrl path = QUrl::fromLocalFile(UBSettings::settings()->uniboardImageLibraryDirectory()); userPath(path); content << listElementsInPath(path.toLocalFile()); } - else if (pPath == mInteractiveUserDirectoryPath.toLocalFile()){ +/* else if (pPath == mInteractiveUserDirectoryPath.toLocalFile()){ content << listElementsInPath(UBSettings::settings()->uniboardInteractiveLibraryDirectory()); content << listElementsInPath(UBSettings::settings()->uniboardInteractiveFavoritesDirectory()); - } + }*/ return content; }