Merge branch 'master' of github.com:trueos/lumina

4 files changed, 59 insertions, 27 deletions

diff --git a/src-qt5/core/libLumina/LVideoLabel.cpp b/src-qt5/core/libLumina/LVideoLabel.cpp
index af23330c..bddb1cba 100644
--- a/src-qt5/core/libLumina/LVideoLabel.cpp
+++ b/src-qt5/core/libLumina/LVideoLabel.cpp
@@ -1,11 +1,13 @@
 #include "LVideoLabel.h"
+#include <LuminaXDG.h>
 #include <QCoreApplication>
 
-LVideoLabel::LVideoLabel(QString file, QWidget *parent) : QLabel(parent) {
+LVideoLabel::LVideoLabel(QString file, bool icons, QWidget *parent) : QLabel(parent) {
   thumbnail = QPixmap();
   entered = false;
-  shrink = true;
+  this->icons = icons;
   filepath = file;
+  defaultThumbnail = LXDG::findIcon("unknown", "").pixmap(256,256);
 
   QTimer::singleShot(0, this, SLOT(initializeBackend()) );
 }
@@ -15,10 +17,6 @@ LVideoLabel::~LVideoLabel() {
   surface->deleteLater();
 }
 
-void LVideoLabel::setShrinkPixmap(bool shrink) {
-  this->shrink = shrink;
-}
-
 void LVideoLabel::initializeBackend(){
   mediaPlayer = new QMediaPlayer(this, QMediaPlayer::VideoSurface);
   surface = new LVideoSurface(this);
@@ -26,6 +24,7 @@ void LVideoLabel::initializeBackend(){
   mediaPlayer->setPlaybackRate(3);
   mediaPlayer->setMuted(true);
   
+  this->setPixmap(defaultThumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
   mediaPlayer->setMedia(QUrl::fromLocalFile(filepath));
   mediaPlayer->play();
 
@@ -35,16 +34,27 @@ void LVideoLabel::initializeBackend(){
   this->connect(this, SIGNAL(rollOver()), surface, SLOT(switchRollOver()));
 }
 
+void LVideoLabel::enableIcons() {
+  this->setPixmap(thumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
+  icons = true;
+}
+
+void LVideoLabel::disableIcons() {
+  this->setPixmap(defaultThumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
+  icons = false;
+}
 
 void LVideoLabel::stopVideo(QPixmap pix) {
   if(!entered) {
     emit frameReceived(pix);
     if(thumbnail.isNull())
       thumbnail = pix;
-    this->setPixmap(thumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
+    if(icons)
+      this->setPixmap(thumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
     mediaPlayer->pause();
   }else {
-    this->setPixmap(pix.scaled(this->size(),Qt::IgnoreAspectRatio));
+    if(icons)
+      this->setPixmap(pix.scaled(this->size(),Qt::IgnoreAspectRatio));
   }
 }
 
@@ -78,24 +88,33 @@ void LVideoLabel::setDuration(QMediaPlayer::MediaStatus status) {
 }
 
 void LVideoLabel::resizeEvent(QResizeEvent *event) {
-  if(!thumbnail.isNull()) //Resize the current pixmap to match the new size
-    this->setPixmap(thumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
+  //Resize the current pixmap to match the new size
+  if(!thumbnail.isNull()){
+    if(icons)
+      this->setPixmap(thumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
+    else
+      this->setPixmap(defaultThumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
+  }
   QLabel::resizeEvent(event);
 }
 
 //Start playing the video from the beginning when the mouse enters the label
 void LVideoLabel::enterEvent(QEvent *event) {
-  entered=true;
-  emit rollOver();
-  mediaPlayer->setPosition(0);
-  mediaPlayer->play();
+  if(icons) {
+    entered=true;
+    emit rollOver();
+    mediaPlayer->setPosition(0);
+    mediaPlayer->play();
+  }
   QWidget::enterEvent(event);
 }
 
 //Stop the video and set the thumbnail back to the middle of the video when the mouse leaves the label
 void LVideoLabel::leaveEvent(QEvent *event) {
-  entered=false;
-  mediaPlayer->setPosition(mediaPlayer->duration() / 2);
-  emit rollOver();
+  if(icons) {
+    entered=false;
+    mediaPlayer->setPosition(mediaPlayer->duration() / 2);
+    emit rollOver();
+  }
   QWidget::leaveEvent(event);
 }
diff --git a/src-qt5/core/libLumina/LVideoLabel.h b/src-qt5/core/libLumina/LVideoLabel.h
index f368c1a8..56defb6a 100644
--- a/src-qt5/core/libLumina/LVideoLabel.h
+++ b/src-qt5/core/libLumina/LVideoLabel.h
@@ -10,9 +10,10 @@
 class LVideoLabel : public QLabel{
   Q_OBJECT
   public:
-    LVideoLabel(QString, QWidget* parent=NULL);
+    LVideoLabel(QString, bool, QWidget* parent=NULL);
     ~LVideoLabel();
-    void setShrinkPixmap(bool);
+    void enableIcons();
+    void disableIcons();
 
   protected:
     void enterEvent(QEvent*);
@@ -33,8 +34,9 @@ class LVideoLabel : public QLabel{
     QMediaPlayer *mediaPlayer;
     LVideoSurface *surface;
     QPixmap thumbnail;
+    QPixmap defaultThumbnail;
     bool entered;
-    bool shrink;
+    bool icons;
     QString filepath;
 };
 #endif
diff --git a/src-qt5/core/libLumina/LVideoWidget.cpp b/src-qt5/core/libLumina/LVideoWidget.cpp
index 14490484..f1f74414 100644
--- a/src-qt5/core/libLumina/LVideoWidget.cpp
+++ b/src-qt5/core/libLumina/LVideoWidget.cpp
@@ -1,20 +1,22 @@
 #include "LVideoWidget.h"
 
-LVideoWidget::LVideoWidget(QString file, QSize iconSize, QWidget *parent) : QWidget(parent) {
-  flag = false;
-  iconLabel = new LVideoLabel(file, parent);
+LVideoWidget::LVideoWidget(QString file, QSize iconSize, bool icons, QWidget *parent) : QWidget(parent) {
+  iconLabel = new LVideoLabel(file, icons, parent);
   textLabel = new QLabel(parent);
 
   layout = new QHBoxLayout(this);
   layout->setAlignment(Qt::AlignLeft | Qt::AlignCenter);
-  layout->addWidget(iconLabel);
-  layout->addWidget(textLabel);
+  layout->setContentsMargins(5,5,5,5);
   layout->setStretchFactor(textLabel, 1); //make sure this always occupies all extra space
 
   textLabel->setText(file.section("/", -1));
+  iconLabel->setGeometry(QRect(QPoint(0,0), iconSize));
   iconLabel->setFixedSize(iconSize);
   iconLabel->setVisible(true);
   textLabel->setVisible(true);
+
+  layout->addWidget(iconLabel);
+  layout->addWidget(textLabel);
 }
 
 LVideoWidget::~LVideoWidget() {
@@ -26,3 +28,11 @@ LVideoWidget::~LVideoWidget() {
 void LVideoWidget::setIconSize(QSize iconSize) {
   iconLabel->setFixedSize(iconSize);
 }
+
+void LVideoWidget::enableIcons() {
+  iconLabel->enableIcons();
+}
+
+void LVideoWidget::disableIcons() {
+  iconLabel->disableIcons();
+}
diff --git a/src-qt5/core/libLumina/LVideoWidget.h b/src-qt5/core/libLumina/LVideoWidget.h
index c239a697..610fd9e5 100644
--- a/src-qt5/core/libLumina/LVideoWidget.h
+++ b/src-qt5/core/libLumina/LVideoWidget.h
@@ -8,12 +8,13 @@
 class LVideoWidget : public QWidget {
   Q_OBJECT
   public:
-    LVideoWidget(QString, QSize, QWidget* parent=NULL);
+    LVideoWidget(QString, QSize, bool icons, QWidget* parent=NULL);
     ~LVideoWidget();
     void setIconSize(QSize);
+    void disableIcons();
+    void enableIcons();
 
   private:
-    bool flag;
     LVideoLabel *iconLabel;
     QLabel *textLabel;
     QHBoxLayout *layout;