1 files changed, 14 insertions, 27 deletions
diff --git a/src/dialogs/Logout.cpp b/src/dialogs/Logout.cpp
index 54ccb7c6..882ef915 100644
--- a/src/dialogs/Logout.cpp
+++ b/src/dialogs/Logout.cpp
@@ -17,13 +17,14 @@
 
 #include <QLabel>
 #include <QPaintEvent>
+#include <QPainter>
+#include <QPushButton>
 #include <QStyleOption>
 #include <QVBoxLayout>
 
 #include "dialogs/Logout.h"
 
 #include "Config.h"
-#include "ui/FlatButton.h"
 #include "ui/Theme.h"
 
 using namespace dialogs;
@@ -31,6 +32,11 @@ using namespace dialogs;
 Logout::Logout(QWidget *parent)
   : QFrame(parent)
 {
+        setAutoFillBackground(true);
+        setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
+        setWindowModality(Qt::WindowModal);
+        setAttribute(Qt::WA_DeleteOnClose, true);
+
         setMinimumWidth(conf::modals::MIN_WIDGET_WIDTH);
         setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 
@@ -42,40 +48,21 @@ Logout::Logout(QWidget *parent)
         buttonLayout->setSpacing(0);
         buttonLayout->setMargin(0);
 
-        QFont buttonFont;
-        buttonFont.setPointSizeF(buttonFont.pointSizeF() * conf::modals::BUTTON_TEXT_SIZE_RATIO);
-
-        confirmBtn_ = new FlatButton("OK", this);
-        confirmBtn_->setFont(buttonFont);
-        confirmBtn_->setRippleStyle(ui::RippleStyle::NoRipple);
-
-        cancelBtn_ = new FlatButton(tr("CANCEL"), this);
-        cancelBtn_->setFont(buttonFont);
-        cancelBtn_->setRippleStyle(ui::RippleStyle::NoRipple);
+        confirmBtn_ = new QPushButton("Logout", this);
+        cancelBtn_  = new QPushButton(tr("Cancel"), this);
+        cancelBtn_->setDefault(true);
 
         buttonLayout->addStretch(1);
-        buttonLayout->addWidget(confirmBtn_);
+        buttonLayout->setSpacing(15);
         buttonLayout->addWidget(cancelBtn_);
-
-        QFont font;
-        font.setPointSizeF(font.pointSizeF() * conf::modals::LABEL_MEDIUM_SIZE_RATIO);
+        buttonLayout->addWidget(confirmBtn_);
 
         auto label = new QLabel(tr("Logout. Are you sure?"), this);
-        label->setFont(font);
 
         layout->addWidget(label);
         layout->addLayout(buttonLayout);
         layout->addStretch(1);
 
-        connect(confirmBtn_, &QPushButton::clicked, [this]() { emit closing(true); });
-        connect(cancelBtn_, &QPushButton::clicked, [this]() { emit closing(false); });
-}
-
-void
-Logout::paintEvent(QPaintEvent *)
-{
-        QStyleOption opt;
-        opt.init(this);
-        QPainter p(this);
-        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+        connect(confirmBtn_, &QPushButton::clicked, this, &Logout::loggingOut);
+        connect(cancelBtn_, &QPushButton::clicked, this, &Logout::close);
 }