From fdee08df3241e6edf13c97da2f996e0de2380673 Mon Sep 17 00:00:00 2001
From: krepa098 <krepa098@users.noreply.github.com>
Date: Sun, 7 Dec 2014 20:52:01 +0100
Subject: [PATCH] ui tweaks

---
 src/chatlog/content/filetransferwidget.cpp | 17 +++++++++++------
 src/chatlog/content/filetransferwidget.ui  | 22 ++++++++++++++++++++--
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp
index 33fcc505e..f9578b8c8 100644
--- a/src/chatlog/content/filetransferwidget.cpp
+++ b/src/chatlog/content/filetransferwidget.cpp
@@ -42,8 +42,8 @@ FileTransferWidget::FileTransferWidget(QWidget *parent, ToxFile file)
     ui->filenameLabel->setText(file.fileName);
     ui->progressBar->setValue(0);
     ui->fileSizeLabel->setText(getHumanReadableSize(file.filesize));
-    ui->progressLabel->setText("0%");
-    ui->etaLabel->setText("--:--");
+    ui->progressLabel->setText("0kiB/s");
+    ui->etaLabel->setText("-:-");
 
     setStyleSheet(Style::getStylesheet(":/ui/fileTransferInstance/grey.css"));
     Style::repolish(this);
@@ -267,10 +267,15 @@ void FileTransferWidget::handleButton(QPushButton *btn)
 
 void FileTransferWidget::showPreview(const QString &filename)
 {
-    //QPixmap pmap = QPixmap(filename).scaled(QSize(ui->previewLabel->maximumWidth(), maximumHeight()), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    QPixmap pmap = QPixmap(filename).scaledToWidth(ui->previewLabel->maximumWidth(), Qt::SmoothTransformation);
-    ui->previewLabel->setPixmap(pmap);
-    ui->previewLabel->show();
+    static const QStringList previewExtensions = { "png", "jpeg", "jpg", "gif" };
+
+    if(previewExtensions.contains(QFileInfo(filename).suffix()))
+    {
+        //QPixmap pmap = QPixmap(filename).scaled(QSize(ui->previewLabel->maximumWidth(), maximumHeight()), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        QPixmap pmap = QPixmap(filename).scaledToWidth(ui->previewLabel->maximumWidth(), Qt::SmoothTransformation);
+        ui->previewLabel->setPixmap(pmap);
+        ui->previewLabel->show();
+    }
 }
 
 void FileTransferWidget::on_topButton_clicked()
diff --git a/src/chatlog/content/filetransferwidget.ui b/src/chatlog/content/filetransferwidget.ui
index 7992bce16..aaad82199 100644
--- a/src/chatlog/content/filetransferwidget.ui
+++ b/src/chatlog/content/filetransferwidget.ui
@@ -71,7 +71,7 @@
         <item>
          <widget class="QLabel" name="filenameLabel">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -101,6 +101,12 @@
            </property>
            <item>
             <widget class="QLabel" name="fileSizeLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
              <property name="text">
               <string>10Mb</string>
              </property>
@@ -111,8 +117,14 @@
            </item>
            <item>
             <widget class="QLabel" name="progressLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
              <property name="text">
-              <string>24%</string>
+              <string>0kb/s</string>
              </property>
              <property name="alignment">
               <set>Qt::AlignCenter</set>
@@ -121,6 +133,12 @@
            </item>
            <item>
             <widget class="QLabel" name="etaLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
              <property name="text">
               <string>ETA:10:10</string>
              </property>