summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorJoanna Hulboj <joanna.hulboj@isode.com>2017-02-24 09:24:36 (GMT)
committerKevin Smith <kevin.smith@isode.com>2017-03-03 14:41:29 (GMT)
commitae0c4b8fe9a21f758f06461a52c3bb7a66be0c45 (patch)
treea8a475bcedeef913fd534aa241ffeb0e4d2bd761 /Swift
parent5fa6933f9cc3e6d0df8c6896871cbe6cc09a9492 (diff)
downloadswift-ae0c4b8fe9a21f758f06461a52c3bb7a66be0c45.zip
swift-ae0c4b8fe9a21f758f06461a52c3bb7a66be0c45.tar.bz2
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
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/QtJoinMUCWindow.cpp6
-rw-r--r--Swift/QtUI/QtJoinMUCWindow.h4
-rw-r--r--Swift/QtUI/QtJoinMUCWindow.ui2
3 files changed, 7 insertions, 5 deletions
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>