Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-01-21 22:23:57 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-01-21 22:23:57 (GMT) |
| commit | ed97a906d08d7613ae8a0e4c3c5cf1362f7dadd4 (patch) | |
| tree | f262988bd42562811a744456e58e84e79c0b33f1 | |
| parent | 0f6c1f851c3a232b25b2b21388f335d0d8dbe815 (diff) | |
| download | swift-ed97a906d08d7613ae8a0e4c3c5cf1362f7dadd4.zip swift-ed97a906d08d7613ae8a0e4c3c5cf1362f7dadd4.tar.bz2 | |
Add a search button in MUC search dialog.
Resolves: #750
| -rw-r--r-- | Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp | 1 | ||||
| -rw-r--r-- | Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui | 13 | ||||
| -rw-r--r-- | Swift/QtUI/QtJoinMUCWindow.cpp | 1 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp b/Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp index 52fbf8c..f150174 100644 --- a/Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp +++ b/Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp @@ -37,6 +37,7 @@ QtMUCSearchWindow::QtMUCSearchWindow() { ui_.results_->setRootIsDecorated(true); ui_.results_->setAnimated(true); ui_.results_->setAlternatingRowColors(true); + connect(ui_.searchButton, SIGNAL(clicked()), this, SLOT(handleSearch())); connect(ui_.service_, SIGNAL(activated(const QString&)), this, SLOT(handleSearch(const QString&))); connect(ui_.results_->selectionModel(), SIGNAL(selectionChanged (const QItemSelection&, const QItemSelection&)), this, SLOT(handleSelectionChanged (const QItemSelection&, const QItemSelection&))); connect(ui_.results_, SIGNAL(activated(const QModelIndex&)), this, SLOT(handleActivated(const QModelIndex&))); diff --git a/Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui b/Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui index f1a1fd5..e078d34 100644 --- a/Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui +++ b/Swift/QtUI/MUCSearch/QtMUCSearchWindow.ui @@ -34,7 +34,7 @@ </property> </widget> </item> - <item row="0" column="2"> + <item row="0" column="3"> <widget class="QLineEdit" name="filter_"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> @@ -50,10 +50,10 @@ </property> </widget> </item> - <item row="1" column="0" colspan="3"> + <item row="1" column="0" colspan="4"> <widget class="QTreeView" name="results_"/> </item> - <item row="2" column="0" colspan="3"> + <item row="2" column="0" colspan="4"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> <spacer name="horizontalSpacer"> @@ -90,6 +90,13 @@ </item> </layout> </item> + <item row="0" column="2"> + <widget class="QToolButton" name="searchButton"> + <property name="text"> + <string>List rooms</string> + </property> + </widget> + </item> </layout> </widget> <resources/> diff --git a/Swift/QtUI/QtJoinMUCWindow.cpp b/Swift/QtUI/QtJoinMUCWindow.cpp index 7471c6f..60558ad 100644 --- a/Swift/QtUI/QtJoinMUCWindow.cpp +++ b/Swift/QtUI/QtJoinMUCWindow.cpp @@ -17,7 +17,6 @@ QtJoinMUCWindow::QtJoinMUCWindow() { connect(ui.room, SIGNAL(returnPressed()), this, SLOT(handleJoin())); connect(ui.searchButton, SIGNAL(clicked()), this, SLOT(handleSearch())); connect(ui.joinButton, SIGNAL(clicked()), this, SLOT(handleJoin())); - resize(200, 100); } void QtJoinMUCWindow::handleJoin() { |