From 5e9fefcc3a1ab106c44a80e12d6e34b7fb3d0397 Mon Sep 17 00:00:00 2001 From: Richard Maudsley Date: Mon, 7 Apr 2014 11:39:35 +0100 Subject: Clear the reason field in invite dialogs before showing them Change-Id: I97bfe54d028658aaa1385284669c3e2892d2f175 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); 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()); -- cgit v0.10.2-6-g49f6