Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-10-05 07:34:05 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-10-05 07:34:05 (GMT) |
| commit | 3e972565e51f5b2fa7e9768d5d84a7d4b6dfc09b (patch) | |
| tree | b5b464804d169396f0cdd7348f4ae600ee2efe33 /Swift/QtUI | |
| parent | 1f4be30a480818458fd841809585681597be831e (diff) | |
| download | swift-3e972565e51f5b2fa7e9768d5d84a7d4b6dfc09b.zip swift-3e972565e51f5b2fa7e9768d5d84a7d4b6dfc09b.tar.bz2 | |
Allow joining passworded MUCs.
Resolves: #991
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtJoinMUCWindow.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/QtJoinMUCWindow.ui | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Swift/QtUI/QtJoinMUCWindow.cpp b/Swift/QtUI/QtJoinMUCWindow.cpp index fec3c4d..14777bd 100644 --- a/Swift/QtUI/QtJoinMUCWindow.cpp +++ b/Swift/QtUI/QtJoinMUCWindow.cpp @@ -38,8 +38,9 @@ void QtJoinMUCWindow::handleJoin() { } lastSetNick = Q2PSTRING(ui.nickName->text()); + std::string password = Q2PSTRING(ui.password->text()); JID room(Q2PSTRING(ui.room->text())); - uiEventStream->send(boost::make_shared<JoinMUCUIEvent>(room, lastSetNick, ui.joinAutomatically->isChecked(), !ui.instantRoom->isChecked())); + uiEventStream->send(boost::make_shared<JoinMUCUIEvent>(room, password, lastSetNick, ui.joinAutomatically->isChecked(), !ui.instantRoom->isChecked())); hide(); } @@ -59,6 +60,7 @@ void QtJoinMUCWindow::setMUC(const std::string& nick) { void QtJoinMUCWindow::show() { QWidget::show(); QWidget::activateWindow(); + ui.password->setText(""); } } diff --git a/Swift/QtUI/QtJoinMUCWindow.ui b/Swift/QtUI/QtJoinMUCWindow.ui index 74fe513..4c4935a 100644 --- a/Swift/QtUI/QtJoinMUCWindow.ui +++ b/Swift/QtUI/QtJoinMUCWindow.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>410</width> - <height>212</height> + <height>224</height> </rect> </property> <property name="sizePolicy"> @@ -53,6 +53,16 @@ </property> </widget> </item> + <item row="2" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="password"/> + </item> </layout> </item> <item> |