1 files changed, 26 insertions, 1 deletions
diff --git a/Swift/QtUI/QtBookmarkDetailWindow.cpp b/Swift/QtUI/QtBookmarkDetailWindow.cpp
index ae84b4b..1e84067 100644
--- a/Swift/QtUI/QtBookmarkDetailWindow.cpp
+++ b/Swift/QtUI/QtBookmarkDetailWindow.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -16,4 +16,5 @@ QtBookmarkDetailWindow::QtBookmarkDetailWindow(QWidget* parent) : QDialog(parent
 	//connect(buttons_, SIGNAL(accepted()), SLOT(accept()));
 	//connect(buttons_, SIGNAL(rejected()), SLOT(reject()));
+	setFixedHeight(sizeHint().height());
 }
 
@@ -50,3 +51,27 @@ boost::optional<MUCBookmark> QtBookmarkDetailWindow::createBookmarkFromForm() {
 }
 
+void QtBookmarkDetailWindow::createFormFromBookmark(const MUCBookmark& bookmark) {
+	if (bookmark.getRoom().isValid()) {
+		room_->setText(P2QSTRING(bookmark.getRoom().toString()));
+	}
+
+	if (!bookmark.getName().empty()) {
+		name_->setText(P2QSTRING(bookmark.getName()));
+	}
+
+	if (bookmark.getNick()) {
+		nick_->setText(P2QSTRING((*bookmark.getNick())));
+	}
+
+	if (bookmark.getPassword()) {
+		password_->setText(P2QSTRING((*bookmark.getPassword())));
+	}
+
+	if (bookmark.getAutojoin()) {
+		autojoin_->setCheckState(Qt::Checked);
+	} else {
+		autojoin_->setCheckState(Qt::Unchecked);
+	}
+}
+
 }