From adf2019c56c654b8b20fe50fedd0f2c140706770 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Tue, 25 Sep 2018 14:41:47 +0300
Subject: [PATCH] Use QPushButton on the preview modal

---
 src/Config.h                         |  5 ++---
 src/dialogs/PreviewUploadOverlay.cpp | 13 ++++---------
 src/dialogs/PreviewUploadOverlay.h   |  7 +++----
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Config.h b/src/Config.h
index 08db958f..3bcaa200 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -46,9 +46,8 @@ constexpr int TEXT_SPACING = 4;
 constexpr int BUTTON_SIZE   = 36;
 constexpr int BUTTON_RADIUS = BUTTON_SIZE / 2;
 
-constexpr float BUTTON_TEXT_SIZE_RATIO  = 1.3;
-constexpr float LABEL_MEDIUM_SIZE_RATIO = 1.3;
-constexpr float LABEL_BIG_SIZE_RATIO    = 2;
+constexpr auto LABEL_MEDIUM_SIZE_RATIO = 1.3;
+constexpr auto LABEL_BIG_SIZE_RATIO    = 2;
 }
 
 namespace strings {
diff --git a/src/dialogs/PreviewUploadOverlay.cpp b/src/dialogs/PreviewUploadOverlay.cpp
index 82366f1a..c404799e 100644
--- a/src/dialogs/PreviewUploadOverlay.cpp
+++ b/src/dialogs/PreviewUploadOverlay.cpp
@@ -39,14 +39,13 @@ PreviewUploadOverlay::PreviewUploadOverlay(QWidget *parent)
   : QWidget{parent}
   , titleLabel_{this}
   , fileName_{this}
-  , upload_{tr("Upload").toUpper(), this}
-  , cancel_{tr("Cancel").toUpper(), this}
+  , upload_{tr("Upload"), this}
+  , cancel_{tr("Cancel"), this}
 {
         auto hlayout = new QHBoxLayout;
         hlayout->addStretch(1);
-        hlayout->addWidget(&upload_);
         hlayout->addWidget(&cancel_);
-        hlayout->setSpacing(0);
+        hlayout->addWidget(&upload_);
         hlayout->setMargin(0);
 
         auto vlayout = new QVBoxLayout{this};
@@ -57,6 +56,7 @@ PreviewUploadOverlay::PreviewUploadOverlay(QWidget *parent)
         vlayout->setSpacing(conf::modals::WIDGET_SPACING);
         vlayout->setMargin(conf::modals::WIDGET_MARGIN);
 
+        upload_.setDefault(true);
         connect(&upload_, &QPushButton::clicked, [this]() {
                 emit confirmUpload(data_, mediaType_, fileName_.text());
                 close();
@@ -96,11 +96,6 @@ PreviewUploadOverlay::init()
         upload_.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         cancel_.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
-        QFont buttonFont;
-        buttonFont.setPointSizeF(buttonFont.pointSizeF() * conf::modals::BUTTON_TEXT_SIZE_RATIO);
-        upload_.setFont(buttonFont);
-        cancel_.setFont(buttonFont);
-
         if (isImage_) {
                 infoLabel_.setAlignment(Qt::AlignCenter);
 
diff --git a/src/dialogs/PreviewUploadOverlay.h b/src/dialogs/PreviewUploadOverlay.h
index 8d093c7f..8099d9c2 100644
--- a/src/dialogs/PreviewUploadOverlay.h
+++ b/src/dialogs/PreviewUploadOverlay.h
@@ -20,10 +20,9 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QPixmap>
+#include <QPushButton>
 #include <QWidget>
 
-#include "ui/FlatButton.h"
-
 class QMimeData;
 
 namespace dialogs {
@@ -55,7 +54,7 @@ private:
         QLabel infoLabel_;
         QLineEdit fileName_;
 
-        FlatButton upload_;
-        FlatButton cancel_;
+        QPushButton upload_;
+        QPushButton cancel_;
 };
 } // dialogs