From: Markus Goetz <markus@woboq.com>
Date: Mon, 20 Feb 2017 12:58:35 +0000 (+0100)
Subject: Message Boxes: Force to be more on top #5503 (#5536)
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~809
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=65d8f51a10d87d37984e9f738750301ec96fddc2;p=nextcloud-desktop.git

Message Boxes: Force to be more on top #5503 (#5536)
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 3bfb54cb0..4eae28f67 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -900,6 +900,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction dir, bool *cancel
             "If this was an accident and you decide to keep your files, they will be re-synced from the server.");
     QMessageBox msgBox(QMessageBox::Warning, tr("Remove All Files?"),
                        msg.arg(shortGuiLocalPath()));
+    msgBox.setWindowFlags(msgBox.windowFlags() | Qt::WindowStaysOnTopHint);
     msgBox.addButton(tr("Remove all files"), QMessageBox::DestructiveRole);
     QPushButton* keepBtn = msgBox.addButton(tr("Keep files"), QMessageBox::AcceptRole);
     if (msgBox.exec() == -1) {
@@ -924,6 +925,7 @@ void Folder::slotAboutToRestoreBackup(bool *restore)
            "Do you want to keep your local most recent files as conflict files?");
     QMessageBox msgBox(QMessageBox::Warning, tr("Backup detected"),
                        msg.arg(shortGuiLocalPath()));
+    msgBox.setWindowFlags(msgBox.windowFlags() | Qt::WindowStaysOnTopHint);
     msgBox.addButton(tr("Normal Synchronisation"), QMessageBox::DestructiveRole);
     QPushButton* keepBtn = msgBox.addButton(tr("Keep Local Files as Conflict"), QMessageBox::AcceptRole);
 
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 832297c6b..72d43ba26 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -924,6 +924,7 @@ void ownCloudGui::setPauseOnAllFoldersHelper(bool pause)
 void ownCloudGui::slotShowGuiMessage(const QString &title, const QString &message)
 {
     QMessageBox *msgBox = new QMessageBox;
+    msgBox->setWindowFlags(msgBox->windowFlags() | Qt::WindowStaysOnTopHint);
     msgBox->setAttribute(Qt::WA_DeleteOnClose);
     msgBox->setText(message);
     msgBox->setWindowTitle(title);