Center window on screen

Author: jonaski

src/mainwindow.cpp

@@ -20,6 +20,7 @@
 #include <QMainWindow>
 #include <QWidget>
 #include <QApplication>
+#include <QScreen>
 #include <QAbstractItemModel>
 #include <QItemSelectionModel>
 #include <QItemSelection>
@@ -148,7 +149,7 @@ MainWindow::MainWindow(Application *app, const CommandlineOptions &options, QWid
   connect(ui_->button_restore, SIGNAL(clicked()), SLOT(Restore()));
   connect(ui_->button_back, SIGNAL(clicked()), SLOT(Reset()));
   connect(ui_->button_cancel, SIGNAL(clicked()), SLOT(Cancel()));
-  connect(ui_->button_exit, SIGNAL(clicked()), SLOT(MaybeExit()));
+  connect(ui_->button_exit, SIGNAL(clicked()), SLOT(Exit()));
   connect(ui_->button_select_all, SIGNAL(clicked()), ui_->file_view_container->view(), SLOT(SelectAll()));
   connect(ui_->button_unselect_all, SIGNAL(clicked()), ui_->file_view_container->view(), SLOT(UnSelectAll()));
 
@@ -216,6 +217,14 @@ void MainWindow::LoadGeometry() {
   }
   s.endGroup();
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+  QScreen *screen = QGuiApplication::screenAt(pos());
+  const QRect sr = screen->availableGeometry();
+  const QRect wr({}, frameSize().boundedTo(sr.size()));
+  resize(wr.size());
+  move(sr.center() - wr.center());
+#endif
+
 }
 
 void MainWindow::SaveGeometry() {
@@ -403,14 +412,6 @@ void MainWindow::ConnectionFailure(const QString &error) {
 
 }
 
-void MainWindow::MaybeExit() {
-
-  if (ui_->stackedWidget->currentWidget() != ui_->progress) {
-    qApp->quit();
-  }
-
-}
-
 void MainWindow::Cancel() {
 
   if (ui_->stackedWidget->currentWidget() == ui_->progress) {

src/mainwindow.h

@@ -81,7 +81,6 @@ class MainWindow : public QMainWindow {
   void ConnectionFailure(const QString &error);
 
   void Reset();
-  void MaybeExit();
   void Cancel();
   void Restore();