Merge remote-tracking branch 'remotes/origin/release-1.30'

src/board/UBBoardController.cpp

@@ -1693,7 +1693,7 @@ UBGraphicsAudioItem* UBBoardController::addAudio(const QUrl& pSourceUrl, bool st
     QUuid uuid = QUuid::createUuid();
     QUrl concreteUrl = pSourceUrl;
 
-    concreteUrl = QUrl(UBPersistenceManager::persistenceManager()
+    concreteUrl = QUrl::fromLocalFile(mActiveDocument->persistencePath() + "/" + UBPersistenceManager::persistenceManager()
                        ->addAudioFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid));
 
     UBGraphicsAudioItem* vi = mActiveScene->addAudio(concreteUrl, startPlay, pos);

src/board/UBBoardPaletteManager.cpp

@@ -68,6 +68,7 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll
     , mZoomPalette(0)
     , mLeftPalette(NULL)
     , mRightPalette(NULL)
+    , mDesktopRightPalette(NULL)
     , mBackgroundsPalette(0)
     , mToolsPalette(0)
     , mAddItemPalette(0)

src/board/UBLibraryController.cpp

@@ -353,7 +353,6 @@ QList<UBLibElement*> UBLibraryController::listElementsInPath(const QString& pPat
         UBLibElement *element = new UBLibElement(fileType, QUrl::fromLocalFile(fileInfo->absoluteFilePath()), itemName);
 
         if (fileType == eUBLibElementType_Folder) {
-//            QImage* directoryImage = new QImage(":images/libpalette/folder.svg");
             element->setThumbnail(QImage(":images/libpalette/folder.svg"));
         }
         else if (fileType == eUBLibElementType_Item) {