Swiftdiff options
| author | Joanna Hulboj <joanna.hulboj@isode.com> | 2017-02-24 09:24:36 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2017-03-03 14:41:29 (GMT) |
| commit | ae0c4b8fe9a21f758f06461a52c3bb7a66be0c45 (patch) | |
| tree | a8a475bcedeef913fd534aa241ffeb0e4d2bd761 /Swift/QtUI/QtJoinMUCWindow.cpp | |
| parent | 5fa6933f9cc3e6d0df8c6896871cbe6cc09a9492 (diff) | |
| download | swift-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/QtUI/QtJoinMUCWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtJoinMUCWindow.cpp | 6 |
1 files changed, 3 insertions, 3 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 @@ -40,37 +40,37 @@ void QtJoinMUCWindow::handleJoin() { if (ui.room->text().isEmpty() || !ui.room->hasAcceptableInput()) { QToolTip::showText(ui.room->mapToGlobal(QPoint()), tr("Please enter a valid room address."), ui.room); return; } if (ui.nickName->text().isEmpty() || !ui.nickName->hasAcceptableInput()) { QToolTip::showText(ui.nickName->mapToGlobal(QPoint()), tr("Please enter a valid nickname."), ui.nickName); return; } lastSetNick = Q2PSTRING(ui.nickName->text()); std::string password = Q2PSTRING(ui.password->text()); JID room(Q2PSTRING(ui.room->text())); uiEventStream->send(std::make_shared<JoinMUCUIEvent>(room, password, lastSetNick, ui.joinAutomatically->isChecked(), !ui.instantRoom->isChecked())); hide(); } void QtJoinMUCWindow::handleSearch() { onSearchMUC(); } void QtJoinMUCWindow::setNick(const std::string& nick) { ui.nickName->setText(P2QSTRING(nick)); lastSetNick = nick; } void QtJoinMUCWindow::setMUC(const std::string& nick) { ui.room->setText(P2QSTRING(nick)); } void QtJoinMUCWindow::show() { - QWidget::show(); - QWidget::activateWindow(); - QWidget::raise(); + QDialog::show(); + QDialog::activateWindow(); + QDialog::raise(); ui.password->setText(""); } } |