summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-12-27 11:23:31 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-12-27 11:23:31 (GMT)
commit350c4b1b42ac5cd938dc8576107f1abaae13b64a (patch)
tree0a81a996200b3259d164760381b1034cc6f9d26c /Swift/QtUI/UserSearch
parentfb05907ebc4cfa39fa702ef4b81b668fc1bba8b7 (diff)
downloadswift-350c4b1b42ac5cd938dc8576107f1abaae13b64a.zip
swift-350c4b1b42ac5cd938dc8576107f1abaae13b64a.tar.bz2
Show form instructions for user search.
Resolves: #732
Diffstat (limited to 'Swift/QtUI/UserSearch')
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFieldsPage.ui4
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchWindow.cpp1
2 files changed, 3 insertions, 2 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.ui b/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.ui
index 35f9830..f2b5916 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.ui
+++ b/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.ui
@@ -15,9 +15,9 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
- <widget class="QLabel" name="label_4">
+ <widget class="QLabel" name="instructionsLabel_">
<property name="text">
- <string>Enter search terms</string>
+ <string/>
</property>
</widget>
</item>
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index e436066..356f9e6 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -180,6 +180,7 @@ void QtUserSearchWindow::setSearchFields(boost::shared_ptr<SearchPayload> fields
fieldsPage_->fetchingThrobber_->hide();
fieldsPage_->fetchingThrobber_->movie()->stop();
fieldsPage_->fetchingLabel_->hide();
+ fieldsPage_->instructionsLabel_->setText(fields->getInstructions() ? P2QSTRING(fields->getInstructions().get()) : "Enter search terms");
bool enabled[8] = {fields->getNick(), fields->getNick(), fields->getFirst(), fields->getFirst(), fields->getLast(), fields->getLast(), fields->getEMail(), fields->getEMail()};
QWidget* legacySearchWidgets[8] = {fieldsPage_->nickInputLabel_, fieldsPage_->nickInput_, fieldsPage_->firstInputLabel_, fieldsPage_->firstInput_, fieldsPage_->lastInputLabel_, fieldsPage_->lastInput_, fieldsPage_->emailInputLabel_, fieldsPage_->emailInput_};
for (int i = 0; i < 8; i++) {