From ae0c4b8fe9a21f758f06461a52c3bb7a66be0c45 Mon Sep 17 00:00:00 2001
From: Joanna Hulboj <joanna.hulboj@isode.com>
Date: Fri, 24 Feb 2017 09:24:36 +0000
Subject: Change Enter Room... QWidget to QDialog

Test-Information:
Tested under Linux i3 tiling windows manager.
Run Swift, from the menu choose Actions, Enter Room... Enter Room...
dialog is displayed as a floating window in a tiling manager.

Change-Id: I31dc4f8caa04fe137e89f2bcb12852cd0b709bab

diff --git a/Swift/QtUI/QtJoinMUCWindow.cpp b/Swift/QtUI/QtJoinMUCWindow.cpp
index 400d1bf..13de1c9 100644
--- a/Swift/QtUI/QtJoinMUCWindow.cpp
+++ b/Swift/QtUI/QtJoinMUCWindow.cpp
@@ -67,9 +67,9 @@ void QtJoinMUCWindow::setMUC(const std::string& nick) {
 }
 
 void QtJoinMUCWindow::show() {
-    QWidget::show();
-    QWidget::activateWindow();
-    QWidget::raise();
+    QDialog::show();
+    QDialog::activateWindow();
+    QDialog::raise();
     ui.password->setText("");
 }
 
diff --git a/Swift/QtUI/QtJoinMUCWindow.h b/Swift/QtUI/QtJoinMUCWindow.h
index c2e8068..2fa1152 100644
--- a/Swift/QtUI/QtJoinMUCWindow.h
+++ b/Swift/QtUI/QtJoinMUCWindow.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include <QDialog>
 #include <QValidator>
 
 #include <Swift/Controllers/UIInterfaces/JoinMUCWindow.h>
@@ -53,7 +54,8 @@ namespace Swift {
             }
     };
 
-    class QtJoinMUCWindow : public QWidget, public JoinMUCWindow {
+        class QtJoinMUCWindow : public QDialog, public JoinMUCWindow {
+
             Q_OBJECT
         public:
             QtJoinMUCWindow(UIEventStream* uiEventStream);
diff --git a/Swift/QtUI/QtJoinMUCWindow.ui b/Swift/QtUI/QtJoinMUCWindow.ui
index f294f8c..24d6ab8 100644
--- a/Swift/QtUI/QtJoinMUCWindow.ui
+++ b/Swift/QtUI/QtJoinMUCWindow.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QtJoinMUCWindow</class>
- <widget class="QWidget" name="QtJoinMUCWindow">
+ <widget class="QDialog" name="QtJoinMUCWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
-- 
cgit v0.10.2-6-g49f6