From 5ad284705760c451012a5d896251af538e7bcede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Mon, 28 Feb 2011 21:02:32 +0100
Subject: Join MUC dialog tweaks.


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>
-- 
cgit v0.10.2-6-g49f6