last commit

Sankore_3.1.pro

@@ -12,8 +12,8 @@ linux-g++-64 {
 
 VERSION_MAJ = 1
 VERSION_MIN = 40 
-VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
+VERSION_TYPE = a # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 01
+VERSION_PATCH = 00
 
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")

src/gui/UBMediaPlayer.cpp

@@ -102,8 +102,8 @@ UBMediaPlayer::UBMediaPlayer() :
     vLayout->addWidget(&m_videoWindow);
 //    m_videoWidget->setStyleSheet(QString("background:red;"));
     QVBoxLayout *buttonPanelLayout = new QVBoxLayout();
-#ifdef Q_WS_MAC
+#ifndef Q_WS_WIN
-	m_videoWindow.hide();
+        m_videoWindow.hide();
 #endif
 //    buttonPanelLayout->addLayout(layout);
 

src/gui/UBTeacherBarWidget.cpp

@@ -386,7 +386,7 @@ void UBTeacherBarWidget::loadContent()
             mpPreview->mediaViewer()->loadWidgets(widgetList,false);
             int loadedMedia = mpPreview->mediaViewer()->loadMedia(nextInfos.medias);
             if(loadedMedia)
-                mpPreview->mediaLabel()->setVisible(true);
+                    mpPreview->mediaLabel()->setVisible(true);
         }