Merge branch 'master' of github.com:Sankore/Sankore-3.1

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -1854,7 +1854,7 @@ UBGraphicsAudioItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::audioItemFromSvg()
         href = mDocumentPath + "/" + href.right(href.length() - indexOfAudioDirectory);
     }
 
-    UBGraphicsAudioItem* audioItem = new UBGraphicsAudioItem(href);
+    UBGraphicsAudioItem* audioItem = new UBGraphicsAudioItem(QUrl::fromLocalFile(href));
     graphicsItemFromSvg(audioItem);
     QStringRef ubPos = mXmlReader.attributes().value(mNamespaceUri, "position");
 

src/board/UBBoardPaletteManager.cpp

@@ -112,11 +112,6 @@ UBBoardPaletteManager::~UBBoardPaletteManager()
         delete mpLibWidget;
         mpLibWidget = NULL;
     }
-    if(NULL != mpTeacherBarWidget)
-    {
-        delete mpTeacherBarWidget;
-        mpTeacherBarWidget = NULL;
-    }
     if(NULL != mpCachePropWidget)
     {
         delete mpCachePropWidget;

src/domain/UBGraphicsMediaItem.cpp

@@ -86,12 +86,13 @@ QVariant UBGraphicsMediaItem::itemChange(GraphicsItemChange change, const QVaria
 
 void UBGraphicsMediaItem::clearSource()
 {
-    QString path = mediaFileUrl().path();
+    QString path = mediaFileUrl().toLocalFile();
     //if path is absolute clean duplicated path string
     if (!path.contains(UBApplication::boardController->activeDocument()->persistencePath()))
         path = UBApplication::boardController->activeDocument()->persistencePath() + "/" + path;
 
-    UBFileSystemUtils::deleteFile(path);
+    if (!UBFileSystemUtils::deleteFile(path))
+        qDebug() << "cannot delete file: " << path;
 }
 
 void UBGraphicsMediaItem::toggleMute()

src/gui/UBTeacherBarPreviewWidget.cpp

@@ -161,7 +161,8 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM
 
     // Build the Preview widget
     // Session Title
-    mTitleContainer.setLayout(&mTitleLayout);
+    mpTitleContainer = new QWidget(this);
+    mpTitleContainer->setLayout(&mTitleLayout);
     mpSessionTitle = new QLabel(this);
     mpSessionTitle->setText(tr("Session: "));
     mpSessionTitle->setWordWrap(true);
@@ -170,23 +171,23 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM
     mLayout.addWidget(mpSessionTitle);
 
     // Title
-    mTitleContainer.setLayout(&mTitleLayout);
+    mpTitleContainer->setLayout(&mTitleLayout);
     mTitleLayout.setContentsMargins(0, 0, 0, 0);
-    mpTitleLabel = new QLabel(&mTitleContainer);
+    mpTitleLabel = new QLabel(mpTitleContainer);
     mpTitleLabel->setText(tr("Activity"));
     mpTitleLabel->setObjectName("UBTeacherBarPreviewSubtitle");
     mTitleLayout.addWidget(mpTitleLabel, 0);
-    mpTitle = new QLabel(&mTitleContainer);
+    mpTitle = new QLabel(mpTitleContainer);
     mpTitle->setObjectName("UBTeacherBarPreviewTitle");
     mpTitle->setWordWrap(true);
     mpTitle->setAlignment(Qt::AlignLeft);
     mTitleLayout.addWidget(mpTitle, 1);
-    mpPageNbrLabel = new QLabel(tr("Page n° "), &mTitleContainer);
+    mpPageNbrLabel = new QLabel(tr("Page n° "), mpTitleContainer);
     mpPageNbrLabel->setAlignment(Qt::AlignRight);
     mpPageNbrLabel->setObjectName("UBTBPreviewSessionTitle");
     mTitleLayout.addWidget(mpPageNbrLabel);
     mTitleLayout.addWidget(&mTitleSeparator);
-    mLayout.addWidget(&mTitleContainer);
+    mLayout.addWidget(mpTitleContainer);
 
     // Content
     mpContentContainer = new UBTBPreviewContainer(this);
@@ -212,13 +213,6 @@ UBTeacherBarPreviewWidget::UBTeacherBarPreviewWidget(UBTeacherBarDataMgr* pDataM
 
 UBTeacherBarPreviewWidget::~UBTeacherBarPreviewWidget()
 {
-    DELETEPTR(mpEditButton);
-    DELETEPTR(mpLicenseLabel);
-    DELETEPTR(mpScheduleLabel);
-    DELETEPTR(mpPageNbrLabel);
-    DELETEPTR(mpTitle);
-    DELETEPTR(mpTitleLabel);
-    DELETEPTR(mpSessionTitle);
 }
 
 void UBTeacherBarPreviewWidget::onActiveSceneChanged()
@@ -245,9 +239,9 @@ void UBTeacherBarPreviewWidget::updateFields()
     if("" != mpDataMgr->pageTitle()){
         mpTitle->setText(mpDataMgr->pageTitle());
         mpPageNbrLabel->setText(tr("Page n° %0").arg(UBApplication::boardController->activeSceneIndex()));
-        mTitleContainer.setVisible(true);
+        mpTitleContainer->setVisible(true);
     }else{
-        mTitleContainer.setVisible(false);
+        mpTitleContainer->setVisible(false);
     }
 
     // Actions

src/gui/UBTeacherBarPreviewWidget.h

@@ -83,7 +83,7 @@ private:
     // Titles
     QVBoxLayout mTitleLayout;
     UBTBSeparator mTitleSeparator;
-    QWidget mTitleContainer;
+    QWidget* mpTitleContainer;
     QLabel* mpSessionTitle;
     QLabel* mpTitle;
     QLabel* mpTitleLabel;

src/gui/UBTeacherBarWidget.cpp

@@ -66,11 +66,6 @@ UBTeacherBarWidget::UBTeacherBarWidget(QWidget *parent, const char *name):UBDock
 
 UBTeacherBarWidget::~UBTeacherBarWidget()
 {
-    DELETEPTR(mpDocPreviewWidget);
-    DELETEPTR(mpDocEditWidget);
-    DELETEPTR(mpPageEditWidget);
-    DELETEPTR(mpPreview);
-    DELETEPTR(mpStackWidget);
 }
 
 void UBTeacherBarWidget::onActiveDocumentChanged()