Fixed issues with previews and LVideoWidget sizing

6 files changed, 31 insertions, 20 deletions

diff --git a/src-qt5/core/libLumina/LVideoLabel.cpp b/src-qt5/core/libLumina/LVideoLabel.cpp
index bc70a292..bddb1cba 100644
--- a/src-qt5/core/libLumina/LVideoLabel.cpp
+++ b/src-qt5/core/libLumina/LVideoLabel.cpp
@@ -2,11 +2,12 @@
 #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;
-  icons = true;
+  this->icons = icons;
   filepath = file;
+  defaultThumbnail = LXDG::findIcon("unknown", "").pixmap(256,256);
 
   QTimer::singleShot(0, this, SLOT(initializeBackend()) );
 }
@@ -23,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();
 
@@ -38,7 +40,7 @@ void LVideoLabel::enableIcons() {
 }
 
 void LVideoLabel::disableIcons() {
-  this->setPixmap(LXDG::findIcon("unknown", "").pixmap(this->size()));
+  this->setPixmap(defaultThumbnail.scaled(this->size(),Qt::IgnoreAspectRatio));
   icons = false;
 }
 
@@ -47,10 +49,12 @@ void LVideoLabel::stopVideo(QPixmap pix) {
     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));
   }
 }
 
@@ -84,8 +88,13 @@ 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);
 }
 
diff --git a/src-qt5/core/libLumina/LVideoLabel.h b/src-qt5/core/libLumina/LVideoLabel.h
index 3c6b304c..56defb6a 100644
--- a/src-qt5/core/libLumina/LVideoLabel.h
+++ b/src-qt5/core/libLumina/LVideoLabel.h
@@ -10,7 +10,7 @@
 class LVideoLabel : public QLabel{
   Q_OBJECT
   public:
-    LVideoLabel(QString, QWidget* parent=NULL);
+    LVideoLabel(QString, bool, QWidget* parent=NULL);
     ~LVideoLabel();
     void enableIcons();
     void disableIcons();
@@ -34,6 +34,7 @@ class LVideoLabel : public QLabel{
     QMediaPlayer *mediaPlayer;
     LVideoSurface *surface;
     QPixmap thumbnail;
+    QPixmap defaultThumbnail;
     bool entered;
     bool icons;
     QString filepath;
diff --git a/src-qt5/core/libLumina/LVideoWidget.cpp b/src-qt5/core/libLumina/LVideoWidget.cpp
index b9660b10..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() {
diff --git a/src-qt5/core/libLumina/LVideoWidget.h b/src-qt5/core/libLumina/LVideoWidget.h
index 6743acb6..610fd9e5 100644
--- a/src-qt5/core/libLumina/LVideoWidget.h
+++ b/src-qt5/core/libLumina/LVideoWidget.h
@@ -8,14 +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;
diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp
index fb55ad99..c712afed 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp
@@ -88,7 +88,7 @@ void MainUI::LoadFile(QString path, QString type){
       ui->label_file_size->setText( ui->label_file_size->text()+" ("+QString::number(pix.width())+" x "+QString::number(pix.height())+" px)" );
     }else if(INFO->isVideo()){
       ui->label_file_icon->hide();
-      LVideoLabel *mediaLabel = new LVideoLabel(INFO->absoluteFilePath(), ui->tab_file);
+      LVideoLabel *mediaLabel = new LVideoLabel(INFO->absoluteFilePath(), true, ui->tab_file);
       mediaLabel->setFixedSize(64,64);
       ui->formLayout->replaceWidget(ui->label_file_icon, mediaLabel);
     }else{
diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
index 0384d892..0983a7b4 100644
--- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp
@@ -38,7 +38,6 @@ BrowserWidget::~BrowserWidget(){
 }
 
 void BrowserWidget::changeDirectory(QString dir){
-  qDebug() << "changing";
   videoMap.clear();
   if(BROWSER->currentDirectory()==dir){ return; } //already on this directory
   //qDebug() << "Change Directory:" << dir << historyList;
@@ -116,10 +115,10 @@ void BrowserWidget::showThumbnails(bool show){
     QTreeWidgetItem *it = videoMap[file].first;
     LVideoWidget *widget = videoMap[file].second;
     if(show) {
-      widget->disableIcons();
+      widget->enableIcons();
       treeWidget->setItemWidget(it, 0, widget);
     }else{
-      widget->enableIcons();
+      widget->disableIcons();
       treeWidget->setItemWidget(it, 0, widget);
     }
   }
@@ -351,13 +350,14 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){
       }else if(info->isVideo() && videoMap.find(info->absoluteFilePath()) == videoMap.end()) {
         it = new CQTreeWidgetItem(treeWidget);
         treeWidget->addTopLevelItem(it);
-        LVideoWidget *widget = new LVideoWidget(info->absoluteFilePath(), treeWidget->iconSize(), treeWidget);
+        LVideoWidget *widget = new LVideoWidget(info->absoluteFilePath(), treeWidget->iconSize(), hasThumbnails(), treeWidget);
         videoMap.insert(info->absoluteFilePath(), QPair<QTreeWidgetItem*,LVideoWidget*>(it, widget));
         treeWidget->setItemWidget(it, 0, widget);
       }else if(info->isVideo()) {
         it = videoMap[info->absoluteFilePath()].first;
         LVideoWidget *widget = videoMap[info->absoluteFilePath()].second;
         widget->setIconSize(treeWidget->iconSize());
+        treeWidget->setItemWidget(it, 0, widget);
       }else{
         it = new CQTreeWidgetItem(treeWidget);
         treeWidget->addTopLevelItem(it);