summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-04-07 10:39:35 (GMT)
committerRichard Maudsley <richard.maudsley@isode.com>2014-04-07 13:07:50 (GMT)
commit5e9fefcc3a1ab106c44a80e12d6e34b7fb3d0397 (patch)
tree7c272c31b12e2b6a33d792c43419f0e778b7a075
parenta7c7602e89d58056940885112f8764a31e9991da (diff)
downloadswift-5e9fefcc3a1ab106c44a80e12d6e34b7fb3d0397.zip
swift-5e9fefcc3a1ab106c44a80e12d6e34b7fb3d0397.tar.bz2
Clear the reason field in invite dialogs before showing them
Change-Id: I97bfe54d028658aaa1385284669c3e2892d2f175
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp4
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h1
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchWindow.cpp1
3 files changed, 6 insertions, 0 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
index 360ce0a..47d62d9 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
@@ -57,6 +57,10 @@ bool QtUserSearchFirstMultiJIDPage::isComplete() const {
return !contactList_->getList().empty();
}
+void QtUserSearchFirstMultiJIDPage::reset() {
+ reason_->clear();
+}
+
void QtUserSearchFirstMultiJIDPage::emitCompletenessCheck() {
emit completeChanged();
}
diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h
index 9905f21..431dd3c 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h
@@ -34,6 +34,7 @@ namespace Swift {
public:
QtUserSearchFirstMultiJIDPage(UserSearchWindow::Type type, const QString& title, SettingsProvider* settings);
virtual bool isComplete() const;
+ void reset();
signals:
void onJIDsDropped(std::vector<JID> jid);
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index ec5dd39..72c2964 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -73,6 +73,7 @@ QtUserSearchWindow::~QtUserSearchWindow() {
void QtUserSearchWindow::handleCurrentChanged(int page) {
searchNext_ = false;
+ firstMultiJIDPage_->reset();
resultsPage_->emitCompletenessCheck();
if (page == 1 && lastPage_ == 3) {
addSearchedJIDToList(getContactJID());