Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-04-30 18:26:24 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-04-30 18:26:24 (GMT) |
| commit | 53c24201ab19c660c31a104c848b8ca94187b7c4 (patch) | |
| tree | 695f8c13f5410e7ad7216de41f5c7fc49cd95aa4 /Swift/QtUI/QtBookmarkDetailWindow.cpp | |
| parent | b566cac68d7bb91f726b5353318b3a5eddd8f3c2 (diff) | |
| download | swift-53c24201ab19c660c31a104c848b8ca94187b7c4.zip swift-53c24201ab19c660c31a104c848b8ca94187b7c4.tar.bz2 | |
Edit bookmarks with very basic validation.
Doesn't save yet.
Diffstat (limited to 'Swift/QtUI/QtBookmarkDetailWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtBookmarkDetailWindow.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Swift/QtUI/QtBookmarkDetailWindow.cpp b/Swift/QtUI/QtBookmarkDetailWindow.cpp index ef524c3..b27ed7c 100644 --- a/Swift/QtUI/QtBookmarkDetailWindow.cpp +++ b/Swift/QtUI/QtBookmarkDetailWindow.cpp @@ -6,6 +6,7 @@ #include "QtBookmarkDetailWindow.h" #include "QtSwiftUtil.h" +#include <QMessageBox> namespace Swift { @@ -17,15 +18,24 @@ QtBookmarkDetailWindow::QtBookmarkDetailWindow(QWidget* parent) : QDialog(parent } void QtBookmarkDetailWindow::accept() { - commit(); - QDialog::accept(); + if (commit()) { + QDialog::accept(); + } } boost::shared_ptr<MUCBookmark> QtBookmarkDetailWindow::createBookmarkFromForm() { //check room //check bookmarkName JID room(Q2PSTRING(room_->text())); + if (!room.isValid() || room.getNode().isEmpty() || !room.getResource().isEmpty()) { + QMessageBox::warning(this, "Bookmark not valid", "You must specify a valid room address (e.g. myroom@chats.example.com)."); + return boost::shared_ptr<MUCBookmark>(); + } String name(Q2PSTRING(name_->text())); + if (name.isEmpty()) { + name = room.toString(); + } + String nick(Q2PSTRING(nick_->text())); String password(Q2PSTRING(password_->text())); bool autojoin = autojoin_->isChecked(); |