summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-28 20:02:32 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-28 20:02:32 (GMT)
commit5ad284705760c451012a5d896251af538e7bcede (patch)
tree9f4f6c09bd7ad4c50c918b4bf71f9b67dd6bb7da
parent781f75cf21b89ad1300491a60e2951f45dd4978d (diff)
downloadswift-5ad284705760c451012a5d896251af538e7bcede.zip
swift-5ad284705760c451012a5d896251af538e7bcede.tar.bz2
Join MUC dialog tweaks.
-rw-r--r--Swift/QtUI/QtJoinMUCWindow.cpp6
-rw-r--r--Swift/QtUI/QtJoinMUCWindow.ui2
2 files changed, 6 insertions, 2 deletions
diff --git a/Swift/QtUI/QtJoinMUCWindow.cpp b/Swift/QtUI/QtJoinMUCWindow.cpp
index 5ffc34d..ac55101 100644
--- a/Swift/QtUI/QtJoinMUCWindow.cpp
+++ b/Swift/QtUI/QtJoinMUCWindow.cpp
@@ -12,11 +12,15 @@ namespace Swift {
QtJoinMUCWindow::QtJoinMUCWindow() {
ui.setupUi(this);
#if QT_VERSION >= 0x040700
- ui.room->setPlaceholderText("swift@rooms.swift.im");
+ ui.room->setPlaceholderText("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()));
+ // 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.
+ ui.nickName->setFocus();
}
void QtJoinMUCWindow::handleJoin() {
diff --git a/Swift/QtUI/QtJoinMUCWindow.ui b/Swift/QtUI/QtJoinMUCWindow.ui
index 14774d8..493fb26 100644
--- a/Swift/QtUI/QtJoinMUCWindow.ui
+++ b/Swift/QtUI/QtJoinMUCWindow.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>377</width>
+ <width>410</width>
<height>169</height>
</rect>
</property>