Swiftdiff options
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtJoinMUCWindow.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Swift/QtUI/QtJoinMUCWindow.cpp b/Swift/QtUI/QtJoinMUCWindow.cpp index 537b861..d111756 100644 --- a/Swift/QtUI/QtJoinMUCWindow.cpp +++ b/Swift/QtUI/QtJoinMUCWindow.cpp @@ -1,33 +1,38 @@ /* - * Copyright (c) 2010-2012 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "QtJoinMUCWindow.h" +#include <Swift/QtUI/QtJoinMUCWindow.h> + #include <boost/smart_ptr/make_shared.hpp> -#include <Swift/Controllers/UIEvents/UIEventStream.h> + #include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h> +#include <Swift/Controllers/UIEvents/UIEventStream.h> namespace Swift { QtJoinMUCWindow::QtJoinMUCWindow(UIEventStream* uiEventStream) : uiEventStream(uiEventStream) { ui.setupUi(this); #if QT_VERSION >= 0x040700 ui.room->setPlaceholderText(tr("someroom@rooms.example.com")); #endif connect(ui.room, SIGNAL(returnPressed()), this, SLOT(handleJoin())); connect(ui.searchButton, SIGNAL(clicked()), this, SLOT(handleSearch())); connect(ui.joinButton, SIGNAL(clicked()), this, SLOT(handleJoin())); +#if QT_VERSION < 0x050200 // FIXME: Temporarily set focus on the nickName field first, so that the // placeholder for the room is visible. This is just because Qt hides // the placeholder when a widget is focused for some reason. + // Tracked upstream as QTBUG-33237 and fixed with Qt 5.2.0. ui.nickName->setFocus(); +#endif ui.instantRoom->setChecked(true); ui.nickName->setValidator(new NickValidator(this)); } void QtJoinMUCWindow::handleJoin() { if (ui.room->text().isEmpty()) { |