Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-09-29 06:51:18 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-01 09:55:13 (GMT) |
| commit | 494ee542b0b7cb9a2eb9997865b9ba89a16715bc (patch) | |
| tree | 83d3d90d531e8d6c9aac2cf63d6dcfe7ca3de292 /Swift/QtUI/QtBookmarkDetailWindow.cpp | |
| parent | 19729be77c227a93aad29875d091a8d9010e2769 (diff) | |
| download | swift-contrib-494ee542b0b7cb9a2eb9997865b9ba89a16715bc.zip swift-contrib-494ee542b0b7cb9a2eb9997865b9ba89a16715bc.tar.bz2 | |
Fix resizability behavior of 'Edit Bookmark'-Dialog.
The dialog is now only resizable in width and the line edit fields resize with
the dialog size without leaving awkward whitespace.
Test-Information:
Checked via running Swift and testing that the fields resize in width and the
dialog is fixed in height.
Change-Id: Idd7417720438f20fa051a823df40d89545db9078
Diffstat (limited to 'Swift/QtUI/QtBookmarkDetailWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtBookmarkDetailWindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/QtUI/QtBookmarkDetailWindow.cpp b/Swift/QtUI/QtBookmarkDetailWindow.cpp index 3e501f2..1e84067 100644 --- a/Swift/QtUI/QtBookmarkDetailWindow.cpp +++ b/Swift/QtUI/QtBookmarkDetailWindow.cpp @@ -1,76 +1,77 @@ /* * Copyright (c) 2010-2014 Kevin Smith * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #include "QtBookmarkDetailWindow.h" #include "QtSwiftUtil.h" #include <QMessageBox> namespace Swift { QtBookmarkDetailWindow::QtBookmarkDetailWindow(QWidget* parent) : QDialog(parent) { setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); //connect(buttons_, SIGNAL(accepted()), SLOT(accept())); //connect(buttons_, SIGNAL(rejected()), SLOT(reject())); + setFixedHeight(sizeHint().height()); } void QtBookmarkDetailWindow::accept() { if (commit()) { QDialog::accept(); } } boost::optional<MUCBookmark> QtBookmarkDetailWindow::createBookmarkFromForm() { //check room //check bookmarkName JID room(Q2PSTRING(room_->text())); if (!room.isValid() || room.getNode().empty() || !room.getResource().empty()) { QMessageBox::warning(this, tr("Bookmark not valid"), tr("You must specify a valid room address (e.g. someroom@rooms.example.com).")); return boost::optional<MUCBookmark>(); } std::string name(Q2PSTRING(name_->text())); if (name.empty()) { name = room.toString(); } MUCBookmark bookmark(room, name); std::string nick(Q2PSTRING(nick_->text())); std::string password(Q2PSTRING(password_->text())); bookmark.setAutojoin(autojoin_->isChecked()); if (!nick.empty()) { bookmark.setNick(nick); } if (!password.empty()) { bookmark.setPassword(password); } return bookmark; } 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); } } } |