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

13 years ago · 532f5c4cc0
parent 23a1b8b478 14cb47578b
commit 532f5c4cc0
9 changed files with 20924 additions and 12432 deletions
--- a/resources/library/userImage/Backgrounds/2009_calendar_EU.svg
+++ b/resources/library/userImage/Backgrounds/2009_calendar_EU.svg
--- a/resources/library/userImage/Backgrounds/2009_calendar_US.svg
+++ b/resources/library/userImage/Backgrounds/2009_calendar_US.svg
--- a/resources/library/userImage/Backgrounds/calendar_2011.svg
+++ b/resources/library/userImage/Backgrounds/calendar_2011.svg
--- a/resources/library/userImage/Backgrounds/calendar_2012.svg
+++ b/resources/library/userImage/Backgrounds/calendar_2012.svg
--- a/resources/library/userImage/Backgrounds/calendrier_2011.svg
+++ b/resources/library/userImage/Backgrounds/calendrier_2011.svg
--- a/resources/library/userImage/Backgrounds/calendrier_2012.svg
+++ b/resources/library/userImage/Backgrounds/calendrier_2012.svg
--- a/src/board/UBBoardController.cpp
+++ b/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);
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/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)
--- a/src/board/UBLibraryController.cpp
+++ b/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) {