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

src/customWidgets/UBMediaWidget.cpp

@@ -114,6 +114,9 @@ eMediaType UBMediaWidget::mediaType()
 
 void UBMediaWidget::showEvent(QShowEvent* event)
 {
+	if(mType == eMediaType_Audio){
+		return;
+	}else{
 		if(!mpVideoWidget){
 			mpVideoWidget = new Phonon::VideoWidget(this);
 			mMediaLayout->addStretch(1);
@@ -126,6 +129,7 @@ void UBMediaWidget::showEvent(QShowEvent* event)
 		}
 		QWidget::showEvent(event);
 	}
+}
 
 void UBMediaWidget::hideEvent(QHideEvent* event)
 {
@@ -159,11 +163,11 @@ void UBMediaWidget::createMediaPlayer()
     }else if(eMediaType_Audio == mType){
         mMediaLayout->setContentsMargins(10, 10, 10, 10);
         mpCover = new QLabel(mpMediaContainer);
-        mpMediaContainer->setStyleSheet(QString("background: none;"));
+        //mpMediaContainer->setStyleSheet(QString("background: none;"));
         setAudioCover(":images/libpalette/soundIcon.svg");
         mpCover->setScaledContents(true);
         mMediaLayout->addStretch(1);
-        mMediaLayout->addWidget(mpCover, 0);
+        mMediaLayout->addWidget(mpCover);
         mMediaLayout->addStretch(1);
         mpAudioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
         Phonon::createPath(mpMediaObject, mpAudioOutput);