summary refs log tree commit diff
path: root/src/dialogs
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-09-25 14:41:47 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-09-25 14:41:47 +0300
commitadf2019c56c654b8b20fe50fedd0f2c140706770 (patch)
tree46307517fd0cbffce6ae0766dbb041ab6d718e38 /src/dialogs
parentCopy the missing cmark.dll from the deps directory (diff)
downloadnheko-adf2019c56c654b8b20fe50fedd0f2c140706770.tar.xz
Use QPushButton on the preview modal
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/PreviewUploadOverlay.cpp13
-rw-r--r--src/dialogs/PreviewUploadOverlay.h7
2 files changed, 7 insertions, 13 deletions
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